Roll back of r98854 Accidentally commited merge in progress

indra/llcommon/llversionviewer.h

indra/llmessage/llmessagetemplate.h

indra/llmessage/lltemplatemessagebuilder.cpp

indra/llmessage/lltemplatemessagereader.cpp

indra/llmessage/llurlrequest.cpp

indra/llmessage/message.cpp

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llselectmgr.cpp

indra/newview/lltexturecache.cpp

indra/newview/lltoolgrab.cpp

indra/newview/lltoolgrab.h

indra/newview/llviewerjoystick.cpp

indra/newview/llviewerjoystick.h

indra/newview/llviewermenu.cpp

indra/newview/llviewermessage.cpp

indra/newview/skins/default/xui/de/floater_about.xml

indra/newview/skins/default/xui/de/floater_color_picker.xml

indra/newview/skins/default/xui/de/floater_im.xml

indra/newview/skins/default/xui/de/floater_inspect.xml