diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-11-07 22:55:27 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-11-07 22:55:27 +0000 |
| commit | 050dad0ce35207a4ac1562175e853590ad9b7681 (patch) | |
| tree | be5dc291d2313112e5733d8c004edfe67da6fc54 /indra/newview/llfloaterabout.cpp | |
| parent | 6fd04521d720a3a4904069d10e8ed970d870ba7f (diff) | |
merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079
Diffstat (limited to 'indra/newview/llfloaterabout.cpp')
| -rw-r--r-- | indra/newview/llfloaterabout.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index 460b719094..01e529078f 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -47,7 +47,7 @@ #include "llversionviewer.h" #include "llviewerbuild.h" #include "llvieweruictrlfactory.h" -#include "viewer.h" // for gViewerDigest +#include "llappviewer.h" #if LL_LIBXUL_ENABLED #include "llmozlib.h" @@ -57,7 +57,6 @@ extern LLCPUInfo gSysCPU; extern LLMemoryInfo gSysMemory; -extern LLOSInfo gSysOS; extern U32 gPacketsIn; ///---------------------------------------------------------------------------- @@ -78,13 +77,13 @@ LLFloaterAbout::LLFloaterAbout() // Support for changing product name. LLString title("About "); - title += gSecondLife; + title += LLAppViewer::instance()->getSecondLifeTitle(); setTitle(title); LLString support; // Version string - LLString version = gSecondLife + LLString version = LLAppViewer::instance()->getSecondLifeTitle() + llformat(" %d.%d.%d (%d) %s %s (%s)", LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD, __DATE__, __TIME__, @@ -133,7 +132,7 @@ LLFloaterAbout::LLFloaterAbout() support.append(mem_text); support.append("OS Version: "); - support.append( gSysOS.getOSString().c_str() ); + support.append( LLAppViewer::instance()->getOSInfo().getOSString().c_str() ); support.append("\n"); support.append("Graphics Card Vendor: "); |