4 files changed, 31 insertions, 9 deletions

diff --git a/linden/indra/llmedia/llmediaimplllmozlib.cpp b/linden/indra/llmedia/llmediaimplllmozlib.cpp
index 9e2564a..b0d3eb5 100644
--- a/linden/indra/llmedia/llmediaimplllmozlib.cpp
+++ b/linden/indra/llmedia/llmediaimplllmozlib.cpp
@@ -103,9 +103,6 @@ bool LLMediaImplLLMozLib::startup( LLMediaManagerData* init_data )
                                                                                           init_data->getBrowserProfileDir(),
                                                                                                 init_data->getBrowserParentWindow() );
 
-        // append special string to the embedded browser user agent string
-        LLMozLib::getInstance()->setBrowserAgentId( init_data->getBrowserUserAgentId() );
-
 #if LL_LINUX
         setlocale(LC_ALL, saved_locale.c_str() );
 #endif // LL_LINUX
@@ -124,6 +121,15 @@ bool LLMediaImplLLMozLib::closedown()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// (static)
+bool LLMediaImplLLMozLib::setBrowserUserAgent(std::string user_agent)
+{
+        // append special string to the embedded browser user agent string
+        LLMozLib::getInstance()->setBrowserAgentId(user_agent);
+        return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // virtual
 bool LLMediaImplLLMozLib::init()
 {
diff --git a/linden/indra/llmedia/llmediaimplllmozlib.h b/linden/indra/llmedia/llmediaimplllmozlib.h
index fc5d4e5..4f6b0b7 100644
--- a/linden/indra/llmedia/llmediaimplllmozlib.h
+++ b/linden/indra/llmedia/llmediaimplllmozlib.h
@@ -51,6 +51,12 @@ class LLMediaImplLLMozLib :
                 static bool startup( LLMediaManagerData* init_data );
                 static bool closedown();
 
+                // Update the user-agent string reported when the browser requests
+                // web page, because we need to include the Second Life version 
+                // and skin name (which can change without restarts).
+                // Must be called after startup().
+                static bool setBrowserUserAgent(std::string user_agent);
+
                 /* virtual */ bool init();
                 /* virtual */ std::string getVersion();
                 /* virtual */ bool set404RedirectUrl( std::string redirect_url );
diff --git a/linden/indra/llmedia/llmediamanager.cpp b/linden/indra/llmedia/llmediamanager.cpp
index c9b673d..8d637c0 100644
--- a/linden/indra/llmedia/llmediamanager.cpp
+++ b/linden/indra/llmedia/llmediamanager.cpp
@@ -134,6 +134,14 @@ LLMediaManager* LLMediaManager::getInstance()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// (static)
+void LLMediaManager::setBrowserUserAgent(std::string user_agent)
+{
+        // *HACK: Breaks encapsulation model, as initClass does above. JC
+        LLMediaImplLLMozLib::setBrowserUserAgent(user_agent);
+}
+
+////////////////////////////////////////////////////////////////////////////////
 //
 LLMediaBase* LLMediaManager::createSourceFromMimeType( std::string scheme, std::string mime_type )
 {
diff --git a/linden/indra/llmedia/llmediamanager.h b/linden/indra/llmedia/llmediamanager.h
index 7a2c868..0dbcc4a 100644
--- a/linden/indra/llmedia/llmediamanager.h
+++ b/linden/indra/llmedia/llmediamanager.h
@@ -45,8 +45,7 @@ class LLMediaManagerData
                 LLMediaManagerData() :
                         mBrowserParentWindow( 0 ),
                         mBrowserProfileDir( "" ),
-                        mBrowserProfileName ( "" ),
-                        mBrowserUserAgentId( "" )
+                        mBrowserProfileName ( "" )
                 { };
 
                 void setBrowserApplicationDir( const std::string& browser_application_dir ) { mBrowserApplicationDir = browser_application_dir; };
@@ -64,16 +63,12 @@ class LLMediaManagerData
                 void setBrowserProfileName( const std::string& browser_profile_name ) { mBrowserProfileName = browser_profile_name; };
                 std::string& getBrowserProfileName() { return mBrowserProfileName; };
 
-                void setBrowserUserAgentId( const std::string& browser_user_agent_id ) { mBrowserUserAgentId = browser_user_agent_id; };
-                std::string& getBrowserUserAgentId() { return mBrowserUserAgentId; };
-
         private:
                 void* mBrowserParentWindow;
                 std::string mBrowserProfileDir;
                 std::string mBrowserProfileName;
                 std::string mBrowserApplicationDir;
                 std::string mBrowserComponentDir;
-                std::string mBrowserUserAgentId;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -87,6 +82,13 @@ class LLMediaManager
                 static void cleanupClass();
                 static LLMediaManager* getInstance();
 
+                // We append the skin name to the browser user agent string, so
+                // we need to change it while the app is running, not just at
+                // init time.
+                // Must be called after initClass() above.
+                // *HACK: Breaks encapsulation model. JC
+                static void setBrowserUserAgent(std::string user_agent);
+
                 // Calls update on all media sources
                 static void updateClass();