svn merge -r 113014:113017 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-QAR-1323

indra/newview/app_settings/settings.xml

indra/newview/installers/darwin/dmg-cleanup.applescript

indra/newview/llfloaterfriends.cpp

indra/newview/llimpanel.cpp

indra/newview/llimpanel.h

indra/newview/llimview.cpp

indra/newview/llimview.h

indra/newview/llviewercontrol.cpp

indra/newview/llvoiceclient.cpp

indra/newview/llvoiceclient.h

indra/newview/skins/default/textures/slim_icon_16_viewer.tga

indra/newview/viewer_manifest.py

install.xml