Merged in default (pull request #839)

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/llfloaterfacebook.cpp

indra/newview/llfloaterfacebook.h

indra/newview/llfloateroutfitsnapshot.cpp

indra/newview/llfloatersnapshot.cpp

indra/newview/llfloaterwebcontent.cpp

indra/newview/llnotificationscripthandler.cpp

indra/newview/llpanelpeople.cpp

indra/newview/llpanelpeople.h

indra/newview/llpanelpeoplemenus.cpp

indra/newview/llpanelpeoplemenus.h

indra/newview/llpanelsnapshotoptions.cpp

indra/newview/llsnapshotlivepreview.cpp

indra/newview/lltwitterconnect.cpp

indra/newview/llviewerfloaterreg.cpp

indra/newview/llviewermedia.cpp