From 428efd664d6629f8c590016c80d8a86181bbc2d4 Mon Sep 17 00:00:00 2001 From: Lilly Zenovka Date: Mon, 19 Oct 2009 09:02:41 +0200 Subject: Fixes VWR-12161: avatar_skeleton.xml cannot be parsed --- linden/indra/llmedia/llmediaimplllmozlib.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'linden/indra/llmedia/llmediaimplllmozlib.cpp') 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 @@ #include "GL/gl.h" #endif -#if LL_LINUX - #include -#endif + +#include + #include @@ -89,23 +89,23 @@ LLMediaImplLLMozLib::LLMediaImplLLMozLib() : // (static) super-initialization - called once at application startup bool LLMediaImplLLMozLib::startup( LLMediaManagerData* init_data ) { -#if LL_LINUX + // Yuck, Mozilla's GTK callbacks play with the locale - push/pop // the locale to protect it, as exotic/non-C locales // causes our code lots of general critical weirdness // and crashness. (SL-35450) static std::string saved_locale; saved_locale = setlocale(LC_ALL, NULL); -#endif // LL_LINUX + bool result = LLMozLib::getInstance()->init( init_data->getBrowserApplicationDir(), init_data->getBrowserComponentDir(), init_data->getBrowserProfileDir(), init_data->getBrowserParentWindow() ); -#if LL_LINUX + setlocale(LC_ALL, saved_locale.c_str() ); -#endif // LL_LINUX + return result; } -- cgit v1.1