aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorDavid Seikel2011-02-13 14:38:54 +1000
committerDavid Seikel2011-02-13 14:38:54 +1000
commit325f9c40159793b4d25a19d88dd7e2d205fff3b8 (patch)
tree9aa7136d004b9a81bf423e87f349e48380eb45e7 /linden
parentUNBRANDING! Conservativley remove references to "second life", replacing the... (diff)
downloadmeta-impy-325f9c40159793b4d25a19d88dd7e2d205fff3b8.zip
meta-impy-325f9c40159793b4d25a19d88dd7e2d205fff3b8.tar.gz
meta-impy-325f9c40159793b4d25a19d88dd7e2d205fff3b8.tar.bz2
meta-impy-325f9c40159793b4d25a19d88dd7e2d205fff3b8.tar.xz
Changing some "Second Life" references to "meta-impy".
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/llcommon/llversionviewer.h2
-rw-r--r--linden/indra/newview/viewerversion.h10
-rw-r--r--linden/indra/win_crash_logger/llcrashloggerwindows.cpp2
3 files changed, 7 insertions, 7 deletions
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index ad6a88a..a571b95 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -40,7 +40,7 @@ const S32 LL_VERSION_MINOR = 23;
40const S32 LL_VERSION_PATCH = 5; 40const S32 LL_VERSION_PATCH = 5;
41const S32 LL_VERSION_BUILD = 136262; 41const S32 LL_VERSION_BUILD = 136262;
42 42
43const char * const LL_VIEWER_NAME = "Second Life"; 43const char * const LL_VIEWER_NAME = "meta-impy";
44 44
45// These aren't used anymore. 45// These aren't used anymore.
46// The channel is ViewerChannelName in settings.xml 46// The channel is ViewerChannelName in settings.xml
diff --git a/linden/indra/newview/viewerversion.h b/linden/indra/newview/viewerversion.h
index d67cee5..a517f9f 100644
--- a/linden/indra/newview/viewerversion.h
+++ b/linden/indra/newview/viewerversion.h
@@ -52,15 +52,15 @@ public:
52 // Returns the name of the viewer. Currently always "Imprudence" 52 // Returns the name of the viewer. Currently always "Imprudence"
53 static std::string getImpViewerName() { return sViewerName; } 53 static std::string getImpViewerName() { return sViewerName; }
54 54
55 // Returns the major version of Second Life 55 // Returns the major version of the viewer
56 static S32 getLLMajorVersion() { return LL_VERSION_MAJOR; } 56 static S32 getLLMajorVersion() { return LL_VERSION_MAJOR; }
57 // Returns the minor version of Second Life 57 // Returns the minor version of the viewer
58 static S32 getLLMinorVersion() { return LL_VERSION_MINOR; } 58 static S32 getLLMinorVersion() { return LL_VERSION_MINOR; }
59 // Returns the patch version of Second Life 59 // Returns the patch version of the viewer
60 static S32 getLLPatchVersion() { return LL_VERSION_PATCH; } 60 static S32 getLLPatchVersion() { return LL_VERSION_PATCH; }
61 // Returns the build version of Second Life 61 // Returns the build version of the viewer
62 static S32 getLLBuildVersion() { return LL_VERSION_BUILD; } 62 static S32 getLLBuildVersion() { return LL_VERSION_BUILD; }
63 // Returns the name of the LL viewer ("Second Life") 63 // Returns the name of the viewer ("meta-impy")
64 static std::string getLLViewerName() { return LL_VIEWER_NAME; } 64 static std::string getLLViewerName() { return LL_VIEWER_NAME; }
65 65
66 // Note that the viewer channel is set in settings.xml 66 // Note that the viewer channel is set in settings.xml
diff --git a/linden/indra/win_crash_logger/llcrashloggerwindows.cpp b/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
index c9e01c8..e15268a 100644
--- a/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
+++ b/linden/indra/win_crash_logger/llcrashloggerwindows.cpp
@@ -261,7 +261,7 @@ bool LLCrashLoggerWindows::init(void)
261 /* 261 /*
262 mbstowcs( gProductName, mProductName.c_str(), LL_ARRAY_SIZE(gProductName) ); 262 mbstowcs( gProductName, mProductName.c_str(), LL_ARRAY_SIZE(gProductName) );
263 gProductName[ LL_ARRY_SIZE(gProductName) - 1 ] = 0; 263 gProductName[ LL_ARRY_SIZE(gProductName) - 1 ] = 0;
264 swprintf(gProductName, L"Second Life"); 264 swprintf(gProductName, L"meta-impy");
265 */ 265 */
266 266
267 llinfos << "Loading dialogs" << llendl; 267 llinfos << "Loading dialogs" << llendl;