merge changes for storm-1580

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llassetuploadresponders.cpp

indra/newview/llfloaterpostcard.cpp

indra/newview/llfloatersnapshot.cpp

indra/newview/llfloatersnapshot.h

indra/newview/llpanelsnapshot.cpp

indra/newview/llpanelsnapshot.h

indra/newview/llpanelsnapshotinventory.cpp

indra/newview/llpanelsnapshotlocal.cpp

indra/newview/llpanelsnapshotoptions.cpp

indra/newview/llpanelsnapshotpostcard.cpp

indra/newview/llpanelsnapshotprofile.cpp

indra/newview/llpostcard.cpp

indra/newview/llpostcard.h

indra/newview/llsidetraypanelcontainer.cpp

indra/newview/llsidetraypanelcontainer.h

indra/newview/llviewerfloaterreg.cpp

indra/newview/llviewermedia.cpp

indra/newview/llviewermenufile.cpp