diff options
author | Jacek Antonelli | 2008-08-15 23:45:59 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:59 -0500 |
commit | 6e91a9cc3d5a610198cf526a76e2ab642f10ecd7 (patch) | |
tree | b023869f9daa7f61ea3ab27112d37524bdd88de4 /linden/indra/llmedia/llmediaimplllmozlib.cpp | |
parent | Second Life viewer sources 1.20.12 (diff) | |
download | meta-impy-6e91a9cc3d5a610198cf526a76e2ab642f10ecd7.zip meta-impy-6e91a9cc3d5a610198cf526a76e2ab642f10ecd7.tar.gz meta-impy-6e91a9cc3d5a610198cf526a76e2ab642f10ecd7.tar.bz2 meta-impy-6e91a9cc3d5a610198cf526a76e2ab642f10ecd7.tar.xz |
Second Life viewer sources 1.20.13
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llmedia/llmediaimplllmozlib.cpp | 12 |
1 files changed, 9 insertions, 3 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 ) | |||
103 | init_data->getBrowserProfileDir(), | 103 | init_data->getBrowserProfileDir(), |
104 | init_data->getBrowserParentWindow() ); | 104 | init_data->getBrowserParentWindow() ); |
105 | 105 | ||
106 | // append special string to the embedded browser user agent string | ||
107 | LLMozLib::getInstance()->setBrowserAgentId( init_data->getBrowserUserAgentId() ); | ||
108 | |||
109 | #if LL_LINUX | 106 | #if LL_LINUX |
110 | setlocale(LC_ALL, saved_locale.c_str() ); | 107 | setlocale(LC_ALL, saved_locale.c_str() ); |
111 | #endif // LL_LINUX | 108 | #endif // LL_LINUX |
@@ -124,6 +121,15 @@ bool LLMediaImplLLMozLib::closedown() | |||
124 | } | 121 | } |
125 | 122 | ||
126 | //////////////////////////////////////////////////////////////////////////////// | 123 | //////////////////////////////////////////////////////////////////////////////// |
124 | // (static) | ||
125 | bool LLMediaImplLLMozLib::setBrowserUserAgent(std::string user_agent) | ||
126 | { | ||
127 | // append special string to the embedded browser user agent string | ||
128 | LLMozLib::getInstance()->setBrowserAgentId(user_agent); | ||
129 | return true; | ||
130 | } | ||
131 | |||
132 | //////////////////////////////////////////////////////////////////////////////// | ||
127 | // virtual | 133 | // virtual |
128 | bool LLMediaImplLLMozLib::init() | 134 | bool LLMediaImplLLMozLib::init() |
129 | { | 135 | { |