From 075b5b41dcf4be2c33a4473889fefcbffb1a8fe5 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:14 -0500
Subject: Second Life viewer sources 1.18.4.2-RC

---
 linden/indra/newview/viewer.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'linden/indra/newview/viewer.cpp')

diff --git a/linden/indra/newview/viewer.cpp b/linden/indra/newview/viewer.cpp
index 74d08cb..a29185f 100644
--- a/linden/indra/newview/viewer.cpp
+++ b/linden/indra/newview/viewer.cpp
@@ -5247,7 +5247,7 @@ void send_stats()
 	// send fps only for time app spends in foreground
 	agent["fps"] = (F32)gForegroundFrameCount / gForegroundTime.getElapsedTimeF32();
 	agent["version"] = gCurrentVersion;
-	agent["language"] = gLanguage;
+	agent["language"] = gSavedSettings.getString("Language");
 	
 	agent["sim_fps"] = ((F32) gFrameCount - gSimFrames) /
 		(F32) (gRenderStartTime.getElapsedTimeF32() - gSimLastTime);
@@ -5718,7 +5718,8 @@ int parse_args(int argc, char **argv)
 		else if (!strncmp(argv[j], "-lang", 5))
 		{
 			j++;
-			if (argv[j]) gLanguage = std::string(argv[j]);
+			if (argv[j])
+				gSavedSettings.setString("Language", std::string(argv[j]));
 		}
 		else if (!strcmp(argv[j], "-no-verify-ssl-cert"))
 		{
-- 
cgit v1.1