Merged in lindenlab/viewer-lynx

.hgtags

autobuild.xml

indra/llplugin/CMakeLists.txt

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/llplugin/llpluginclassmediaowner.h

indra/llplugin/llplugincookiestore.cpp

indra/llplugin/llplugincookiestore.h

indra/llplugin/tests/llplugincookiestore_test.cpp

indra/media_plugins/cef/media_plugin_cef.cpp

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llfloaterfacebook.cpp

indra/newview/llfloaterflickr.cpp

indra/newview/llfloatertwitter.cpp

indra/newview/llimprocessing.cpp

indra/newview/llmediactrl.cpp

indra/newview/llstartup.cpp

indra/newview/llviewermedia.cpp