aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/viewer.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:14 -0500
committerJacek Antonelli2008-08-15 23:45:14 -0500
commit075b5b41dcf4be2c33a4473889fefcbffb1a8fe5 (patch)
tree945b9c3a40691e01cd67f6f94324f8b3ded61574 /linden/indra/newview/viewer.cpp
parentSecond Life viewer sources 1.18.4.1-RC (diff)
downloadmeta-impy-075b5b41dcf4be2c33a4473889fefcbffb1a8fe5.zip
meta-impy-075b5b41dcf4be2c33a4473889fefcbffb1a8fe5.tar.gz
meta-impy-075b5b41dcf4be2c33a4473889fefcbffb1a8fe5.tar.bz2
meta-impy-075b5b41dcf4be2c33a4473889fefcbffb1a8fe5.tar.xz
Second Life viewer sources 1.18.4.2-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/viewer.cpp5
1 files changed, 3 insertions, 2 deletions
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()
5247 // send fps only for time app spends in foreground 5247 // send fps only for time app spends in foreground
5248 agent["fps"] = (F32)gForegroundFrameCount / gForegroundTime.getElapsedTimeF32(); 5248 agent["fps"] = (F32)gForegroundFrameCount / gForegroundTime.getElapsedTimeF32();
5249 agent["version"] = gCurrentVersion; 5249 agent["version"] = gCurrentVersion;
5250 agent["language"] = gLanguage; 5250 agent["language"] = gSavedSettings.getString("Language");
5251 5251
5252 agent["sim_fps"] = ((F32) gFrameCount - gSimFrames) / 5252 agent["sim_fps"] = ((F32) gFrameCount - gSimFrames) /
5253 (F32) (gRenderStartTime.getElapsedTimeF32() - gSimLastTime); 5253 (F32) (gRenderStartTime.getElapsedTimeF32() - gSimLastTime);
@@ -5718,7 +5718,8 @@ int parse_args(int argc, char **argv)
5718 else if (!strncmp(argv[j], "-lang", 5)) 5718 else if (!strncmp(argv[j], "-lang", 5))
5719 { 5719 {
5720 j++; 5720 j++;
5721 if (argv[j]) gLanguage = std::string(argv[j]); 5721 if (argv[j])
5722 gSavedSettings.setString("Language", std::string(argv[j]));
5722 } 5723 }
5723 else if (!strcmp(argv[j], "-no-verify-ssl-cert")) 5724 else if (!strcmp(argv[j], "-no-verify-ssl-cert"))
5724 { 5725 {