diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-03-29 18:36:47 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-03-29 18:36:47 -0700 |
| commit | e02e45fd76487fd2f0782b84ed5336a8f43cecac (patch) | |
| tree | 422d57114fdc4e308df4201296b70dbe91da7181 /indra | |
| parent | b69a454aab29a837664760c4034dcaa837ed627a (diff) | |
Fix for EXT-6615 (SL webkit no longer reports "Second Life" in the HTTP_USER_AGENT)
The issue here is that initBrowserWindow() was doing the wrong thing if it got called after the set_user_agent message was received.
Made the handler for the set_user_agent message save the string in a member variable (mUserAgent).
Initialize mUserAgent to the default string in the MediaPluginWebKit constructor.
initBrowserWindow() now sets the user agent string from mUserAgent instead of from a literal.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index 0462fce236..5260636e11 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -89,6 +89,7 @@ private: std::string mProfileDir; std::string mHostLanguage; + std::string mUserAgent; bool mCookiesEnabled; bool mJavascriptEnabled; bool mPluginsEnabled; @@ -300,7 +301,7 @@ private: LLQtWebKit::getInstance()->addObserver( mBrowserWindowId, this ); // append details to agent string - LLQtWebKit::getInstance()->setBrowserAgentId( "LLPluginMedia Web Browser" ); + LLQtWebKit::getInstance()->setBrowserAgentId( mUserAgent ); #if !LL_QTWEBKIT_USES_PIXMAPS // don't flip bitmap @@ -675,6 +676,7 @@ MediaPluginWebKit::MediaPluginWebKit(LLPluginInstance::sendMessageFunction host_ mHostLanguage = "en"; // default to english mJavascriptEnabled = true; // default to on mPluginsEnabled = true; // default to on + mUserAgent = "LLPluginMedia Web Browser"; } MediaPluginWebKit::~MediaPluginWebKit() @@ -1086,8 +1088,8 @@ void MediaPluginWebKit::receiveMessage(const char *message_string) } else if(message_name == "set_user_agent") { - std::string user_agent = message_in.getValue("user_agent"); - LLQtWebKit::getInstance()->setBrowserAgentId( user_agent ); + mUserAgent = message_in.getValue("user_agent"); + LLQtWebKit::getInstance()->setBrowserAgentId( mUserAgent ); } else if(message_name == "init_history") { |