merge fix for STORM-577

indra/llmessage/llcachename.cpp

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llurlentry.cpp

indra/llui/llurlentry.h

indra/lscript/lscript_library/lscript_library.cpp

indra/newview/app_settings/settings.xml

indra/newview/llchathistory.cpp

indra/newview/llfloatertopobjects.cpp

indra/newview/llfloatertopobjects.h

indra/newview/llviewerdisplay.cpp

indra/newview/llviewerdisplay.h

indra/newview/llviewerwindow.cpp

indra/newview/llvocache.cpp

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

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

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

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

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

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