All you need to do is take a cup of flour, add it to the mix
preview sound and animation 'debugging' :B1:
Updated the readme, not sure if its really needed.
I'm just a little salty.
Not even certain how this happened, probably accidently did it
resit old, might revisit this
Message system: forgot to move this over to the public thing
forgot resit settings, lol
these are fake, come back in fix them you sleezy freak
IM_TYPING_STOP: Notifications of abnormal typing stop messages
TODO* Clean this up
Merge remote-tracking branch 'liru/master'

Conflicts:
	indra/newview/CMakeLists.txt
	indra/newview/llinventorybridge.cpp
	indra/newview/llinventorymodel.h
	indra/newview/llviewermenu.cpp
	indra/newview/llworld.cpp
merge conflict
yeah no
Merge remote-tracking branch 'liru/master'
Merge remote-tracking branch 'liru/master'
Merge remote-tracking branch 'liru/master'
Apparently the code I had before just crashes me violently. TYPING_STOP
Just let the IMMgr figure out the session, I don't explode
allow us to tell the vivox client that we want debugging
reverting this
Blind merge; see following commits

Merge remote-tracking branch 'pp/master' into pp_merge

Conflicts:
	README
	indra/llmessage/llmessagetemplate.h
	indra/llmessage/message.cpp
	indra/llmessage/message.h
	indra/newview/app_settings/settings.xml
	indra/newview/awavefront.cpp
	indra/newview/daeexport.cpp
	indra/newview/floaterao.cpp
	indra/newview/llappviewer.cpp
	indra/newview/llappviewer.h
	indra/newview/llfloaterkeytool.cpp
	indra/newview/llfloaterkeytool.h
	indra/newview/llinventoryactions.cpp
	indra/newview/llinventorybackup.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/llkeytool.cpp
	indra/newview/llkeytool.h
	indra/newview/llpreviewanim.cpp
	indra/newview/llpreviewsound.cpp
	indra/newview/llpreviewtexture.cpp
	indra/newview/lltooldraganddrop.cpp
	indra/newview/lltoolpie.cpp
	indra/newview/llviewerinventory.cpp
	indra/newview/llviewermenu.cpp
	indra/newview/llviewerobjectbackup.cpp
	indra/newview/skins/default/xui/en-us/floater_keytool.xml
	indra/newview/skins/default/xui/en-us/menu_inventory.xml
	indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
	indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
	indra/newview/skins/default/xui/en-us/menu_pie_object.xml
Refactor
Someone is going to hate me for this but I've removed all of the <edit>
tags because they seem pointless to me.
What do they mean exactly? Whose edits are they?
If you want to find out edits and changes, compare source trees. Simple
enough.