another hairy merge from viewer-trunk

indra/llcommon/llassettype.cpp

indra/llcommon/llassettype.h

indra/llcommon/llversionserver.h

indra/llcommon/llversionviewer.h

indra/llmessage/llassetstorage.cpp

indra/llmessage/lltransfersourceasset.cpp

indra/llmessage/lltransfersourceasset.h

indra/llplugin/CMakeLists.txt

indra/llplugin/llplugincookiestore.cpp

indra/llplugin/llplugincookiestore.h

indra/llplugin/tests/llplugincookiestore_test.cpp

indra/newview/English.lproj/InfoPlist.strings

indra/newview/Info-SecondLife.plist

indra/newview/llinventorybridge.cpp

indra/newview/llstartup.cpp

indra/newview/llviewermedia.cpp

indra/newview/llviewermedia.h

indra/newview/res/viewerRes.rc