merge from remote repo

indra/cmake/DeploySharedLibs.cmake

indra/cmake/LLSharedLibs.cmake

indra/mac_crash_logger/CMakeLists.txt

indra/mac_updater/CMakeLists.txt

indra/newview/llfloaterpreference.cpp

indra/newview/llinspectavatar.cpp

indra/newview/llselectmgr.cpp

indra/newview/llselectmgr.h

indra/newview/lltoolpie.cpp

indra/newview/llviewerjointmesh.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewermenu.h

...ewview/skins/default/textures/bottomtray/Snapshot_Off.png

indra/newview/skins/default/textures/textures.xml

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

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

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

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

...wview/skins/default/xui/en/panel_preferences_advanced.xml