aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:24 -0500
committerJacek Antonelli2008-08-15 23:45:24 -0500
commit0a78fa3920b32a51f01ebe7cfa30be45134f398f (patch)
tree7d0ebbf55bcb0a77c3957dd64315574281cc2f54 /linden/indra/newview/llappviewer.cpp
parentSecond Life viewer sources 1.18.6.2-RC (diff)
downloadmeta-impy-0a78fa3920b32a51f01ebe7cfa30be45134f398f.zip
meta-impy-0a78fa3920b32a51f01ebe7cfa30be45134f398f.tar.gz
meta-impy-0a78fa3920b32a51f01ebe7cfa30be45134f398f.tar.bz2
meta-impy-0a78fa3920b32a51f01ebe7cfa30be45134f398f.tar.xz
Second Life viewer sources 1.18.6.4-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llappviewer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index a2d70af..d9dbaaa 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -4,7 +4,7 @@
4 * 4 *
5 * $LicenseInfo:firstyear=2007&license=viewergpl$ 5 * $LicenseInfo:firstyear=2007&license=viewergpl$
6 * 6 *
7 * Copyright (c) 2007, Linden Research, Inc. 7 * Copyright (c) 2007-2008, Linden Research, Inc.
8 * 8 *
9 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
10 * The source code in this file ("Source Code") is provided by Linden Lab 10 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -1263,7 +1263,7 @@ bool LLAppViewer::init()
1263 #if LL_WINDOWS && LL_LCD_COMPILE 1263 #if LL_WINDOWS && LL_LCD_COMPILE
1264 // start up an LCD window on a logitech keyboard, if there is one 1264 // start up an LCD window on a logitech keyboard, if there is one
1265 HINSTANCE hInstance = GetModuleHandle(NULL); 1265 HINSTANCE hInstance = GetModuleHandle(NULL);
1266 gLcdScreen = new llLCD(hInstance); 1266 gLcdScreen = new LLLCD(hInstance);
1267 CreateLCDDebugWindows(); 1267 CreateLCDDebugWindows();
1268 #endif 1268 #endif
1269 1269
@@ -2498,7 +2498,7 @@ void LLAppViewer::writeSystemInfo()
2498{ 2498{
2499 gDebugInfo["SLLog"] = LLError::logFileName(); 2499 gDebugInfo["SLLog"] = LLError::logFileName();
2500 2500
2501 gDebugInfo["ClientInfo"]["Name"] = gSecondLife; 2501 gDebugInfo["ClientInfo"]["Name"] = gChannelName;
2502 gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR; 2502 gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
2503 gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR; 2503 gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
2504 gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH; 2504 gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;