aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/llmedia/llmediaimplllmozlib.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/linden/indra/llmedia/llmediaimplllmozlib.cpp b/linden/indra/llmedia/llmediaimplllmozlib.cpp
index 05d7220..93f4a64 100644
--- a/linden/indra/llmedia/llmediaimplllmozlib.cpp
+++ b/linden/indra/llmedia/llmediaimplllmozlib.cpp
@@ -49,9 +49,9 @@
49 #include "GL/gl.h" 49 #include "GL/gl.h"
50#endif 50#endif
51 51
52#if LL_LINUX 52
53 #include <locale.h> 53#include <locale.h>
54#endif 54
55 55
56#include <iostream> 56#include <iostream>
57 57
@@ -89,23 +89,23 @@ LLMediaImplLLMozLib::LLMediaImplLLMozLib() :
89// (static) super-initialization - called once at application startup 89// (static) super-initialization - called once at application startup
90bool LLMediaImplLLMozLib::startup( LLMediaManagerData* init_data ) 90bool LLMediaImplLLMozLib::startup( LLMediaManagerData* init_data )
91{ 91{
92#if LL_LINUX 92
93 // Yuck, Mozilla's GTK callbacks play with the locale - push/pop 93 // Yuck, Mozilla's GTK callbacks play with the locale - push/pop
94 // the locale to protect it, as exotic/non-C locales 94 // the locale to protect it, as exotic/non-C locales
95 // causes our code lots of general critical weirdness 95 // causes our code lots of general critical weirdness
96 // and crashness. (SL-35450) 96 // and crashness. (SL-35450)
97 static std::string saved_locale; 97 static std::string saved_locale;
98 saved_locale = setlocale(LC_ALL, NULL); 98 saved_locale = setlocale(LC_ALL, NULL);
99#endif // LL_LINUX 99
100 100
101 bool result = LLMozLib::getInstance()->init( init_data->getBrowserApplicationDir(), 101 bool result = LLMozLib::getInstance()->init( init_data->getBrowserApplicationDir(),
102 init_data->getBrowserComponentDir(), 102 init_data->getBrowserComponentDir(),
103 init_data->getBrowserProfileDir(), 103 init_data->getBrowserProfileDir(),
104 init_data->getBrowserParentWindow() ); 104 init_data->getBrowserParentWindow() );
105 105
106#if LL_LINUX 106
107 setlocale(LC_ALL, saved_locale.c_str() ); 107 setlocale(LC_ALL, saved_locale.c_str() );
108#endif // LL_LINUX 108
109 109
110 return result; 110 return result;
111} 111}