merge

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llinspectavatar.cpp

indra/newview/llpanellogin.cpp

indra/newview/llpreview.cpp

indra/newview/llpreviewgesture.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewerwindow.cpp

.../newview/skins/default/xui/en/floater_preview_gesture.xml

...newview/skins/default/xui/en/menu_inspect_avatar_gear.xml

indra/newview/skins/default/xui/en/menu_viewer.xml

indra/newview/skins/default/xui/en/notifications.xml

...ewview/skins/default/xui/en/panel_preferences_general.xml