aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmedia/llmediaimplllmozlib.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llmedia/llmediaimplllmozlib.cpp')
-rw-r--r--linden/indra/llmedia/llmediaimplllmozlib.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/linden/indra/llmedia/llmediaimplllmozlib.cpp b/linden/indra/llmedia/llmediaimplllmozlib.cpp
index 93f4a64..5b4b02e 100644
--- a/linden/indra/llmedia/llmediaimplllmozlib.cpp
+++ b/linden/indra/llmedia/llmediaimplllmozlib.cpp
@@ -17,7 +17,8 @@
17 * There are special exceptions to the terms and conditions of the GPL as 17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception 18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or 19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception 20 * online at
21 * http://secondlifegrid.net/programs/open_source/licensing/flossexception
21 * 22 *
22 * By copying, modifying or distributing this software, you acknowledge 23 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above, 24 * that you have read and understood your obligations described above,
@@ -138,10 +139,10 @@ bool LLMediaImplLLMozLib::init()
138 if ( mWindowId ) 139 if ( mWindowId )
139 return false; 140 return false;
140 141
141#if LL_LINUX 142#if defined(LL_LINUX) || defined(WIN32)
142 static std::string saved_locale; 143 static std::string saved_locale;
143 saved_locale = setlocale(LC_ALL, NULL); 144 saved_locale = setlocale(LC_ALL, NULL);
144#endif // LL_LINUX 145#endif // defined(LL_LINUX) || defined(WIN32)
145 146
146 mWindowId = LLMozLib::getInstance()->createBrowserWindow( mBrowserWindowWidth, mBrowserWindowHeight ); 147 mWindowId = LLMozLib::getInstance()->createBrowserWindow( mBrowserWindowWidth, mBrowserWindowHeight );
147 148
@@ -161,9 +162,9 @@ bool LLMediaImplLLMozLib::init()
161 // set media depth now we have created a browser window and know what it is 162 // set media depth now we have created a browser window and know what it is
162 setMediaDepth( LLMozLib::getInstance()->getBrowserDepth( mWindowId ) ); 163 setMediaDepth( LLMozLib::getInstance()->getBrowserDepth( mWindowId ) );
163 164
164#if LL_LINUX 165#if defined(LL_LINUX) || defined(WIN32)
165 setlocale(LC_ALL, saved_locale.c_str() ); 166 setlocale(LC_ALL, saved_locale.c_str() );
166#endif // LL_LINUX 167#endif // defined(LL_LINUX) || defined(WIN32)
167 168
168 return true; 169 return true;
169} 170}