diff options
author | Jacek Antonelli | 2008-10-01 17:19:53 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-10-08 00:52:00 -0500 |
commit | 72d6261a1c1db3045971dd851652289b41696b01 (patch) | |
tree | 863dd162b0075db80628598188c61e2f29a8879a /linden/indra/newview/llappviewer.cpp | |
parent | Fixed bad panel_overlay XML from a sloppy merge. (diff) | |
download | meta-impy-72d6261a1c1db3045971dd851652289b41696b01.zip meta-impy-72d6261a1c1db3045971dd851652289b41696b01.tar.gz meta-impy-72d6261a1c1db3045971dd851652289b41696b01.tar.bz2 meta-impy-72d6261a1c1db3045971dd851652289b41696b01.tar.xz |
Changed viewer and channel name to "Imprudence".
Diffstat (limited to 'linden/indra/newview/llappviewer.cpp')
-rw-r--r-- | linden/indra/newview/llappviewer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 9851e47..90d0429 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp | |||
@@ -308,7 +308,7 @@ const char *VFS_INDEX_FILE_BASE = "index.db2.x."; | |||
308 | static std::string gSecondLife; | 308 | static std::string gSecondLife; |
309 | static std::string gWindowTitle; | 309 | static std::string gWindowTitle; |
310 | #ifdef LL_WINDOWS | 310 | #ifdef LL_WINDOWS |
311 | static char sWindowClass[] = "Second Life"; | 311 | static char sWindowClass[] = IMP_VIEWER_NAME; |
312 | #endif | 312 | #endif |
313 | 313 | ||
314 | std::string gLoginPage; | 314 | std::string gLoginPage; |
@@ -1569,7 +1569,7 @@ bool LLAppViewer::initConfiguration() | |||
1569 | gSavedSettings.setString("ClientSettingsFile", | 1569 | gSavedSettings.setString("ClientSettingsFile", |
1570 | gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFileName("Global"))); | 1570 | gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFileName("Global"))); |
1571 | 1571 | ||
1572 | gSavedSettings.setString("VersionChannelName", LL_CHANNEL); | 1572 | gSavedSettings.setString("VersionChannelName", IMP_VIEWER_NAME); |
1573 | 1573 | ||
1574 | #ifndef LL_RELEASE_FOR_DOWNLOAD | 1574 | #ifndef LL_RELEASE_FOR_DOWNLOAD |
1575 | gSavedSettings.setBOOL("ShowConsoleWindow", TRUE); | 1575 | gSavedSettings.setBOOL("ShowConsoleWindow", TRUE); |
@@ -1836,7 +1836,7 @@ bool LLAppViewer::initConfiguration() | |||
1836 | mYieldTime = gSavedSettings.getS32("YieldTime"); | 1836 | mYieldTime = gSavedSettings.getS32("YieldTime"); |
1837 | 1837 | ||
1838 | // XUI:translate | 1838 | // XUI:translate |
1839 | gSecondLife = "Second Life"; | 1839 | gSecondLife = IMP_VIEWER_NAME; |
1840 | 1840 | ||
1841 | // Read skin/branding settings if specified. | 1841 | // Read skin/branding settings if specified. |
1842 | //if (! gDirUtilp->getSkinDir().empty() ) | 1842 | //if (! gDirUtilp->getSkinDir().empty() ) |
@@ -2082,7 +2082,7 @@ bool LLAppViewer::initWindow() | |||
2082 | 2082 | ||
2083 | // always start windowed | 2083 | // always start windowed |
2084 | BOOL ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth"); | 2084 | BOOL ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth"); |
2085 | gViewerWindow = new LLViewerWindow(gWindowTitle, "Second Life", | 2085 | gViewerWindow = new LLViewerWindow(gWindowTitle, gWindowTitle, |
2086 | gSavedSettings.getS32("WindowX"), gSavedSettings.getS32("WindowY"), | 2086 | gSavedSettings.getS32("WindowX"), gSavedSettings.getS32("WindowY"), |
2087 | gSavedSettings.getS32("WindowWidth"), gSavedSettings.getS32("WindowHeight"), | 2087 | gSavedSettings.getS32("WindowWidth"), gSavedSettings.getS32("WindowHeight"), |
2088 | FALSE, ignorePixelDepth); | 2088 | FALSE, ignorePixelDepth); |