diff options
author | Jacek Antonelli | 2008-08-15 23:45:19 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:19 -0500 |
commit | b235c59d60472f818a9142c0886b95a0ff4191d7 (patch) | |
tree | d323c55587584b19cc43a03f58a178823f12d3cd /linden/indra/newview/llfloaterabout.cpp | |
parent | Second Life viewer sources 1.18.5.3 (diff) | |
download | meta-impy-b235c59d60472f818a9142c0886b95a0ff4191d7.zip meta-impy-b235c59d60472f818a9142c0886b95a0ff4191d7.tar.gz meta-impy-b235c59d60472f818a9142c0886b95a0ff4191d7.tar.bz2 meta-impy-b235c59d60472f818a9142c0886b95a0ff4191d7.tar.xz |
Second Life viewer sources 1.18.6.0-RC
Diffstat (limited to 'linden/indra/newview/llfloaterabout.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterabout.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp index 460b719..01e5290 100644 --- a/linden/indra/newview/llfloaterabout.cpp +++ b/linden/indra/newview/llfloaterabout.cpp | |||
@@ -47,7 +47,7 @@ | |||
47 | #include "llversionviewer.h" | 47 | #include "llversionviewer.h" |
48 | #include "llviewerbuild.h" | 48 | #include "llviewerbuild.h" |
49 | #include "llvieweruictrlfactory.h" | 49 | #include "llvieweruictrlfactory.h" |
50 | #include "viewer.h" // for gViewerDigest | 50 | #include "llappviewer.h" |
51 | 51 | ||
52 | #if LL_LIBXUL_ENABLED | 52 | #if LL_LIBXUL_ENABLED |
53 | #include "llmozlib.h" | 53 | #include "llmozlib.h" |
@@ -57,7 +57,6 @@ | |||
57 | 57 | ||
58 | extern LLCPUInfo gSysCPU; | 58 | extern LLCPUInfo gSysCPU; |
59 | extern LLMemoryInfo gSysMemory; | 59 | extern LLMemoryInfo gSysMemory; |
60 | extern LLOSInfo gSysOS; | ||
61 | extern U32 gPacketsIn; | 60 | extern U32 gPacketsIn; |
62 | 61 | ||
63 | ///---------------------------------------------------------------------------- | 62 | ///---------------------------------------------------------------------------- |
@@ -78,13 +77,13 @@ LLFloaterAbout::LLFloaterAbout() | |||
78 | 77 | ||
79 | // Support for changing product name. | 78 | // Support for changing product name. |
80 | LLString title("About "); | 79 | LLString title("About "); |
81 | title += gSecondLife; | 80 | title += LLAppViewer::instance()->getSecondLifeTitle(); |
82 | setTitle(title); | 81 | setTitle(title); |
83 | 82 | ||
84 | LLString support; | 83 | LLString support; |
85 | 84 | ||
86 | // Version string | 85 | // Version string |
87 | LLString version = gSecondLife | 86 | LLString version = LLAppViewer::instance()->getSecondLifeTitle() |
88 | + llformat(" %d.%d.%d (%d) %s %s (%s)", | 87 | + llformat(" %d.%d.%d (%d) %s %s (%s)", |
89 | LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD, | 88 | LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD, |
90 | __DATE__, __TIME__, | 89 | __DATE__, __TIME__, |
@@ -133,7 +132,7 @@ LLFloaterAbout::LLFloaterAbout() | |||
133 | support.append(mem_text); | 132 | support.append(mem_text); |
134 | 133 | ||
135 | support.append("OS Version: "); | 134 | support.append("OS Version: "); |
136 | support.append( gSysOS.getOSString().c_str() ); | 135 | support.append( LLAppViewer::instance()->getOSInfo().getOSString().c_str() ); |
137 | support.append("\n"); | 136 | support.append("\n"); |
138 | 137 | ||
139 | support.append("Graphics Card Vendor: "); | 138 | support.append("Graphics Card Vendor: "); |