Pull merge from viewer-acme

indra/newview/CMakeLists.txt

indra/newview/app_settings/commands.xml

indra/newview/app_settings/toolbars.xml

indra/newview/llfacebookconnect.cpp

indra/newview/llfacebookconnect.h

indra/newview/llflickrconnect.cpp

indra/newview/llflickrconnect.h

indra/newview/llfloaterflickr.cpp

indra/newview/llfloaterflickr.h

indra/newview/llfloatersnapshot.cpp

indra/newview/llfloatersocial.cpp

indra/newview/llfloatersocial.h

indra/newview/llfloatertwitter.cpp

indra/newview/llfloatertwitter.h

indra/newview/llfloaterwebcontent.cpp

indra/newview/llpanelsnapshotoptions.cpp

indra/newview/llsnapshotlivepreview.cpp

indra/newview/lltwitterconnect.cpp

indra/newview/lltwitterconnect.h

indra/newview/llviewerfloaterreg.cpp