aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/cmake/Variables.cmake2
-rw-r--r--linden/indra/llcommon/llversionviewer.h5
-rw-r--r--linden/indra/newview/app_settings/settings.xml2
-rw-r--r--linden/indra/newview/llappviewer.cpp8
4 files changed, 10 insertions, 7 deletions
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")
79set(GRID agni CACHE STRING "Target Grid") 79set(GRID agni CACHE STRING "Target Grid")
80 80
81set(VIEWER ON CACHE BOOL "Build Second Life viewer.") 81set(VIEWER ON CACHE BOOL "Build Second Life viewer.")
82set(VIEWER_CHANNEL "Developer" CACHE STRING "Viewer Channel Name") 82set(VIEWER_CHANNEL "Imprudence" CACHE STRING "Viewer Channel Name")
83set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") 83set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing")
84 84
85set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.") 85set(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;
37const S32 LL_VERSION_PATCH = 2; 37const S32 LL_VERSION_PATCH = 2;
38const S32 LL_VERSION_BUILD = 0; 38const S32 LL_VERSION_BUILD = 0;
39 39
40const char * const LL_CHANNEL = "Second Life Release"; 40const char * const LL_CHANNEL = "Imprudence";
41
42const char * const LL_VIEWER_NAME = "Second Life";
43const char * const IMP_VIEWER_NAME = "Imprudence";
41 44
42#endif 45#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 @@
9533 <key>Type</key> 9533 <key>Type</key>
9534 <string>String</string> 9534 <string>String</string>
9535 <key>Value</key> 9535 <key>Value</key>
9536 <string>Second Life Release</string> 9536 <string>Imprudence</string>
9537 </map> 9537 </map>
9538 <key>VertexShaderEnable</key> 9538 <key>VertexShaderEnable</key>
9539 <map> 9539 <map>
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.";
308static std::string gSecondLife; 308static std::string gSecondLife;
309static std::string gWindowTitle; 309static 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
314std::string gLoginPage; 314std::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);