From 2a4dea528f670b9bb1f77ef27a8a1dd16603d114 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:50 -0500
Subject: Second Life viewer sources 1.20.7

---
 linden/indra/llmedia/llmediaimplllmozlib.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'linden/indra/llmedia/llmediaimplllmozlib.cpp')

diff --git a/linden/indra/llmedia/llmediaimplllmozlib.cpp b/linden/indra/llmedia/llmediaimplllmozlib.cpp
index 53cb344..9e2564a 100644
--- a/linden/indra/llmedia/llmediaimplllmozlib.cpp
+++ b/linden/indra/llmedia/llmediaimplllmozlib.cpp
@@ -94,7 +94,8 @@ bool LLMediaImplLLMozLib::startup( LLMediaManagerData* init_data )
 	// the locale to protect it, as exotic/non-C locales
 	// causes our code lots of general critical weirdness
 	// and crashness. (SL-35450)
-	std::string saved_locale = setlocale(LC_ALL, NULL);
+	static std::string saved_locale;
+	saved_locale = setlocale(LC_ALL, NULL);
 #endif // LL_LINUX
 
 	bool result = LLMozLib::getInstance()->init( init_data->getBrowserApplicationDir(),
@@ -132,7 +133,8 @@ bool LLMediaImplLLMozLib::init()
 		return false;
 
 #if LL_LINUX
-	std::string saved_locale = setlocale(LC_ALL, NULL);
+	static std::string saved_locale;
+	saved_locale = setlocale(LC_ALL, NULL);
 #endif // LL_LINUX
 
 	mWindowId = LLMozLib::getInstance()->createBrowserWindow( mBrowserWindowWidth, mBrowserWindowHeight );
-- 
cgit v1.1