From 72d6261a1c1db3045971dd851652289b41696b01 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 1 Oct 2008 17:19:53 -0500 Subject: Changed viewer and channel name to "Imprudence". --- ChangeLog.txt | 11 +++++++++++ linden/indra/cmake/Variables.cmake | 2 +- linden/indra/llcommon/llversionviewer.h | 5 ++++- linden/indra/newview/app_settings/settings.xml | 2 +- linden/indra/newview/llappviewer.cpp | 8 ++++---- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 84ff38c..e633431 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,14 @@ +2008-10-01 Jacek Antonelli + + * linden/indra/llcommon/llversionviewer.h: + Changed viewer and channel name to "Imprudence". + * linden/indra/newview/llappviewer.cpp: + Ditto. + * linden/indra/cmake/Variables.cmake: + Ditto. + * linden/indra/newview/app_settings/settings.xml: + Ditto. + 2008-09-28 Jacek Antonelli * linden/indra/newview/llviewermenu.cpp: diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake index 5868e4d..8f33a95 100644 --- a/linden/indra/cmake/Variables.cmake +++ b/linden/indra/cmake/Variables.cmake @@ -79,7 +79,7 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(GRID agni CACHE STRING "Target Grid") set(VIEWER ON CACHE BOOL "Build Second Life viewer.") -set(VIEWER_CHANNEL "Developer" CACHE STRING "Viewer Channel Name") +set(VIEWER_CHANNEL "Imprudence" CACHE STRING "Viewer Channel Name") set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.") diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h index f357b76..2c6f951 100644 --- a/linden/indra/llcommon/llversionviewer.h +++ b/linden/indra/llcommon/llversionviewer.h @@ -37,6 +37,9 @@ const S32 LL_VERSION_MINOR = 21; const S32 LL_VERSION_PATCH = 2; const S32 LL_VERSION_BUILD = 0; -const char * const LL_CHANNEL = "Second Life Release"; +const char * const LL_CHANNEL = "Imprudence"; + +const char * const LL_VIEWER_NAME = "Second Life"; +const char * const IMP_VIEWER_NAME = "Imprudence"; #endif diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 17698d7..be78dd7 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -9533,7 +9533,7 @@ Type String Value - Second Life Release + Imprudence VertexShaderEnable 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."; static std::string gSecondLife; static std::string gWindowTitle; #ifdef LL_WINDOWS - static char sWindowClass[] = "Second Life"; + static char sWindowClass[] = IMP_VIEWER_NAME; #endif std::string gLoginPage; @@ -1569,7 +1569,7 @@ bool LLAppViewer::initConfiguration() gSavedSettings.setString("ClientSettingsFile", gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFileName("Global"))); - gSavedSettings.setString("VersionChannelName", LL_CHANNEL); + gSavedSettings.setString("VersionChannelName", IMP_VIEWER_NAME); #ifndef LL_RELEASE_FOR_DOWNLOAD gSavedSettings.setBOOL("ShowConsoleWindow", TRUE); @@ -1836,7 +1836,7 @@ bool LLAppViewer::initConfiguration() mYieldTime = gSavedSettings.getS32("YieldTime"); // XUI:translate - gSecondLife = "Second Life"; + gSecondLife = IMP_VIEWER_NAME; // Read skin/branding settings if specified. //if (! gDirUtilp->getSkinDir().empty() ) @@ -2082,7 +2082,7 @@ bool LLAppViewer::initWindow() // always start windowed BOOL ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth"); - gViewerWindow = new LLViewerWindow(gWindowTitle, "Second Life", + gViewerWindow = new LLViewerWindow(gWindowTitle, gWindowTitle, gSavedSettings.getS32("WindowX"), gSavedSettings.getS32("WindowY"), gSavedSettings.getS32("WindowWidth"), gSavedSettings.getS32("WindowHeight"), FALSE, ignorePixelDepth); -- cgit v1.1