33 files changed, 65 insertions, 88 deletions

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 05d6175..3120534 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -1,6 +1,6 @@
 # -*- cmake -*-
 #
-# Compilation options shared by all Second Life components.
+# Compilation options shared by all components.
 
 include(Variables)
 
diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake
index 37e77ae..18f3cdd 100644
--- a/linden/indra/cmake/Variables.cmake
+++ b/linden/indra/cmake/Variables.cmake
@@ -1,6 +1,6 @@
 # -*- cmake -*-
 #
-# Definitions of variables used throughout the Second Life build
+# Definitions of variables used throughout the build
 # process.
 #
 # Platform variables:
@@ -73,14 +73,14 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 # Default deploy grid
 set(GRID agni CACHE STRING "Target Grid")
 
-set(VIEWER ON CACHE BOOL "Build Second Life viewer.")
+set(VIEWER ON CACHE BOOL "Build the viewer.")
 set(VIEWER_CHANNEL "meta-impy" 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 meta-impy-supplied prebuilt libraries.")
 
 if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics)
-    set(SERVER ON CACHE BOOL "Build Second Life server software.")
+    set(SERVER ON CACHE BOOL "Build the server software.")
 endif (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics)
 
 if (LINUX AND SERVER AND VIEWER)
diff --git a/linden/indra/lib/python/indra/ipc/servicebuilder.py b/linden/indra/lib/python/indra/ipc/servicebuilder.py
index 04ccee7..c28bea3 100644
--- a/linden/indra/lib/python/indra/ipc/servicebuilder.py
+++ b/linden/indra/lib/python/indra/ipc/servicebuilder.py
@@ -43,10 +43,10 @@ def build(name, context={}, **kwargs):
     """ Convenience method for using a global, singleton, service builder.  Pass arguments either via a dict or via python keyword arguments, or both!
 
     Example use:
-     > context = {'channel':'Second Life Release', 'version':'1.18.2.0'}
+     > context = {'channel':'Grid Viewer Release', 'version':'1.18.2.0'}
      > servicebuilder.build('version-manager-version', context)
        'http://int.util.vaak.lindenlab.com/channel/Second%20Life%20Release/1.18.2.0'
-     > servicebuilder.build('version-manager-version', channel='Second Life Release', version='1.18.2.0')
+     > servicebuilder.build('version-manager-version', channel='Grid Viewer Release', version='1.18.2.0')
        'http://int.util.vaak.lindenlab.com/channel/Second%20Life%20Release/1.18.2.0'
      > servicebuilder.build('version-manager-version', context, version='1.18.1.2')
        'http://int.util.vaak.lindenlab.com/channel/Second%20Life%20Release/1.18.1.2'
diff --git a/linden/indra/llaudio/llstreamingaudio_fmod.cpp b/linden/indra/llaudio/llstreamingaudio_fmod.cpp
index a71a872..238b213 100644
--- a/linden/indra/llaudio/llstreamingaudio_fmod.cpp
+++ b/linden/indra/llaudio/llstreamingaudio_fmod.cpp
@@ -69,7 +69,7 @@ LLStreamingAudio_FMOD::LLStreamingAudio_FMOD() :
         mGain(1.0f)
 {
         // Number of milliseconds of audio to buffer for the audio card.
-        // Must be larger than the usual Second Life frame stutter time.
+        // Must be larger than the usual frame stutter time.
         FSOUND_Stream_SetBufferSize(200);
 
         // Here's where we set the size of the network buffer and some buffering 
diff --git a/linden/indra/llcrashlogger/llcrashlogger.cpp b/linden/indra/llcrashlogger/llcrashlogger.cpp
index aac5592..69e0adb 100755
--- a/linden/indra/llcrashlogger/llcrashlogger.cpp
+++ b/linden/indra/llcrashlogger/llcrashlogger.cpp
@@ -201,7 +201,7 @@ void LLCrashLogger::gatherFiles()
         }
         else
         {
-                // Figure out the filename of the second life log
+                // Figure out the filename of the viewer log
                 LLCurl::setCAFile(gDirUtilp->getCAFile());
                 mFileMap["SecondLifeLog"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"meta-impy.log");
                 mFileMap["SettingsXml"] = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,"settings.xml");
diff --git a/linden/indra/llmessage/llloginflags.h b/linden/indra/llmessage/llloginflags.h
index 6f119e7..ceade87 100644
--- a/linden/indra/llmessage/llloginflags.h
+++ b/linden/indra/llmessage/llloginflags.h
@@ -33,7 +33,7 @@
 #ifndef LL_LLLOGINFLAGS_H
 #define LL_LLLOGINFLAGS_H
 
-// Is this your first login to Second Life?
+// Is this your first login to the grid?
 const U32       LOGIN_FLAG_FIRST_LOGIN                  = (1 << 0);
 
 // Is this a trial account?
diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index dbb057f..81de54f 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -628,7 +628,6 @@ void LLDir::setSkinFolder(const std::string &skin_folder)
         mSkinDir += skin_folder;
 
         // user modifications to current skin
-        // e.g. c:\documents and settings\users\username\application data\second life\skins\dazzle
         mUserSkinDir = getOSUserAppDir();
         mUserSkinDir += mDirDelimiter;
         mUserSkinDir += "skins";
@@ -636,7 +635,6 @@ void LLDir::setSkinFolder(const std::string &skin_folder)
         mUserSkinDir += skin_folder;
 
         // base skin which is used as fallback for all skinned files
-        // e.g. c:\program files\secondlife\skins\default
         mDefaultSkinDir = getAppRODataDir();
         mDefaultSkinDir += mDirDelimiter;
         mDefaultSkinDir += "skins";
diff --git a/linden/indra/llvfs/lldir.h b/linden/indra/llvfs/lldir.h
index 766f351..8f8ac77 100644
--- a/linden/indra/llvfs/lldir.h
+++ b/linden/indra/llvfs/lldir.h
@@ -101,9 +101,9 @@ class LLDir
         const std::string &getCAFile() const;                   // File containing TLS certificate authorities
         const std::string &getDirDelimiter() const;     // directory separator for platform (ie. '\' or '/' or ':')
         const std::string &getSkinDir() const;          // User-specified skin folder.
-        const std::string &getUserSkinDir() const;              // User-specified skin folder with user modifications. e.g. c:\documents and settings\username\application data\second life\skins\curskin
-        const std::string &getDefaultSkinDir() const;   // folder for default skin. e.g. c:\program files\second life\skins\default
-        const std::string getSkinBaseDir() const;               // folder that contains all installed skins (not user modifications). e.g. c:\program files\second life\skins
+        const std::string &getUserSkinDir() const;              // User-specified skin folder with user modifications.
+        const std::string &getDefaultSkinDir() const;   // folder for default skin.
+        const std::string getSkinBaseDir() const;               // folder that contains all installed skins (not user modifications).
         const std::string &getLLPluginDir() const;              // Directory containing plugins and plugin shell
 
         // Expanded filename
diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index 99daa4d..9cbc949 100644
--- a/linden/indra/llwindow/llwindowmacosx.cpp
+++ b/linden/indra/llwindow/llwindowmacosx.cpp
@@ -71,17 +71,17 @@ BOOL check_for_card(const char* RENDERER, const char* bad_card)
         if (!strnicmp(RENDERER, bad_card, strlen(bad_card)))
         {
                 std::string buffer = llformat(
-                        "Your video card appears to be a %s, which Second Life does not support.\n"
+                        "Your video card appears to be a %s, which this viewer does not support.\n"
                         "\n"
-                        "Second Life requires a video card with 32 Mb of memory or more, as well as\n"
+                        "This viewer requires a video card with 32 Mb of memory or more, as well as\n"
                         "multitexture support.  We explicitly support nVidia GeForce 2 or better, \n"
                         "and ATI Radeon 8500 or better.\n"
                         "\n"
                         "If you own a supported card and continue to receive this message, try \n"
                         "updating to the latest video card drivers. Otherwise look in the\n"
-                        "secondlife.com support section or e-mail technical support\n"
+                        "web site support section or e-mail technical support\n"
                         "\n"
-                        "You can try to run Second Life, but it will probably crash or run\n"
+                        "You can try to run this viewer, but it will probably crash or run\n"
                         "very slowly.  Try anyway?",
                         bad_card);
                 S32 button = OSMessageBox(buffer.c_str(), "Unsupported video card", OSMB_YESNO);
@@ -302,7 +302,7 @@ LLWindowMacOSX::LLWindowMacOSX(const std::string& title, const std::string& name
                 if (!gGLManager.initGL())
                 {
                         setupFailure(
-                                "Second Life is unable to run because your video card drivers\n"
+                                "This viewer is unable to run because your video card drivers\n"
                                 "are out of date or unsupported. Please make sure you have\n"
                                 "the latest video card drivers installed.\n"
                                 "If you continue to receive this message, contact customer service.",
@@ -748,10 +748,10 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
         {
                 close();
                 setupFailure(
-                        "Second Life requires True Color (32-bit) to run in a window.\n"
+                        "This viewer requires True Color (32-bit) to run in a window.\n"
                         "Please go to Control Panels -> Display -> Settings and\n"
                         "set the screen to 32-bit color.\n"
-                        "Alternately, if you choose to run fullscreen, Second Life\n"
+                        "Alternately, if you choose to run fullscreen, this viewer\n"
                         "will automatically adjust the screen each time it runs.",
                         "Error",
                         OSMB_OK);
@@ -762,7 +762,7 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
         {
                 close();
                 setupFailure(
-                        "Second Life is unable to run because it can't get an 8 bit alpha\n"
+                        "This viewer is unable to run because it can't get an 8 bit alpha\n"
                         "channel.  Usually this is due to video card driver issues.\n"
                         "Please make sure you have the latest video card drivers installed.\n"
                         "Also be sure your monitor is set to True Color (32-bit) in\n"
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index 1933888..ff27a4b 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -698,16 +698,14 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
                 close();
                 setupFailure(
 #if LL_SOLARIS && defined(__sparc)
-                        "Second Life requires at least 24-bit color on SPARC to run in a window.\n"
+                        "This viewer requires at least 24-bit color on SPARC to run in a window.\n"
                         "Please use fbconfig to set your default color depth to 24 bits.\n"
                         "You may also need to adjust the X11 setting in SMF.  To do so use\n"
                         "  'svccfg -s svc:/application/x11/x11-server setprop options/default_depth=24'\n"
 #else
-                        "Second Life requires True Color (32-bit) to run in a window.\n"
-                        "Please go to Control Panels -> Display -> Settings and\n"
-                        "set the screen to 32-bit color.\n"
+                        "This viewer requires True Color (32-bit) to run in a window.\n"
 #endif
-                        "Alternately, if you choose to run fullscreen, Second Life\n"
+                        "Alternately, if you choose to run fullscreen, this viewer\n"
                         "will automatically adjust the screen each time it runs.",
                         "Error",
                         OSMB_OK);
@@ -719,11 +717,10 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B
         {
                 close();
                 setupFailure(
-                        "Second Life is unable to run because it can't get an 8 bit alpha\n"
+                        "This viewer is unable to run because it can't get an 8 bit alpha\n"
                         "channel.  Usually this is due to video card driver issues.\n"
                         "Please make sure you have the latest video card drivers installed.\n"
-                        "Also be sure your monitor is set to True Color (32-bit) in\n"
-                        "Control Panels -> Display -> Settings.\n"
+                        "Also be sure your monitor is set to True Color (32-bit)n"
                         "If you continue to receive this message, contact customer service.",
                         "Error",
                         OSMB_OK);
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index 7bc9a3b..3fdef30 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -1052,10 +1052,10 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
         {
                 close();
                 OSMessageBox(
-                        "Second Life requires True Color (32-bit) to run in a window.\n"
+                        "This viewer requires True Color (32-bit) to run in a window.\n"
                         "Please go to Control Panels -> Display -> Settings and\n"
                         "set the screen to 32-bit color.\n"
-                        "Alternately, if you choose to run fullscreen, Second Life\n"
+                        "Alternately, if you choose to run fullscreen, this viewer\n"
                         "will automatically adjust the screen each time it runs.",
                         "Error",
                         OSMB_OK);
@@ -1066,7 +1066,7 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
         {
                 close();
                 OSMessageBox(
-                        "Second Life is unable to run because it can't get an 8 bit alpha\n"
+                        "This viewer is unable to run because it can't get an 8 bit alpha\n"
                         "channel.  Usually this is due to video card driver issues.\n"
                         "Please make sure you have the latest video card drivers installed.\n"
                         "Also be sure your monitor is set to True Color (32-bit) in\n"
@@ -1314,10 +1314,10 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
         {
                 close();
                 OSMessageBox(
-                        "Second Life requires True Color (32-bit) to run in a window.\n"
+                        "This viewer requires True Color (32-bit) to run in a window.\n"
                         "Please go to Control Panels -> Display -> Settings and\n"
                         "set the screen to 32-bit color.\n"
-                        "Alternately, if you choose to run fullscreen, Second Life\n"
+                        "Alternately, if you choose to run fullscreen, this viewer\n"
                         "will automatically adjust the screen each time it runs.",
                         "Error",
                         OSMB_OK);
@@ -1328,7 +1328,7 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
         {
                 close();
                 OSMessageBox(
-                        "Second Life is unable to run because it can't get an 8 bit alpha\n"
+                        "This viewer is unable to run because it can't get an 8 bit alpha\n"
                         "channel.  Usually this is due to video card driver issues.\n"
                         "Please make sure you have the latest video card drivers installed.\n"
                         "Also be sure your monitor is set to True Color (32-bit) in\n"
@@ -1357,7 +1357,7 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
         {
                 close();
                 OSMessageBox(
-                                         "Second Life is unable to run because your video card drivers\n"
+                                         "This viewer is unable to run because your video card drivers\n"
                                          "did not install properly, are out of date, or are for unsupported\n" 
                                          "hardware. Please make sure you have the latest video card drivers\n"
                                          "and even if you do have the latest, try reinstalling them.\n\n"
diff --git a/linden/indra/lscript/lscript_library/lscript_library.cpp b/linden/indra/lscript/lscript_library/lscript_library.cpp
index cc56119..59f1824 100644
--- a/linden/indra/lscript/lscript_library/lscript_library.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_library.cpp
@@ -156,7 +156,7 @@ void LLScriptLibrary::init()
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetVel", "v", NULL, "vector llGetVel()\ngets the velocity"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetAccel", "v", NULL, "vector llGetAccel()\ngets the acceleration"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetOmega", "v", NULL, "vector llGetOmega()\ngets the omega"));
-        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetTimeOfDay", "f", "", "float llGetTimeOfDay()\ngets the time in seconds since Second Life server midnight (or since server up-time; whichever is smaller)"));
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetTimeOfDay", "f", "", "float llGetTimeOfDay()\ngets the time in seconds since server midnight (or since server up-time; whichever is smaller)"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetWallclock", "f", "", "float llGetWallclock()\ngets the time in seconds since midnight"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetTime", "f", NULL, "float llGetTime()\ngets the time in seconds since creation"));
         addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llResetTime", NULL, NULL, "llResetTime()\nsets the time to zero"));
diff --git a/linden/indra/mac_updater/mac_updater.cpp b/linden/indra/mac_updater/mac_updater.cpp
index 64afff8..1542a16 100644
--- a/linden/indra/mac_updater/mac_updater.cpp
+++ b/linden/indra/mac_updater/mac_updater.cpp
@@ -669,7 +669,7 @@ static bool isFSRefViewerBundle(FSRef *targetRef)
         return result;
 }
 
-// Search through the directory specified by 'parent' for an item that appears to be a Second Life viewer.
+// Search through the directory specified by 'parent' for an item that appears to be a viewer.
 static OSErr findAppBundleOnDiskImage(FSRef *parent, FSRef *app)
 {
         FSIterator              iterator;
@@ -756,7 +756,7 @@ void *updatethreadproc(void*)
         
         try
         {
-                // Attempt to get a reference to the Second Life application bundle containing this updater.
+                // Attempt to get a reference to the viewer application bundle containing this updater.
                 // Any failures during this process will cause us to default to updating /Applications/Second Life.app
                 {
                         FSRef myBundle;
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 67df287..24f4d9a 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -980,7 +980,7 @@
   <key>SearchURLDefault</key>
   <map>
     <key>Comment</key>
-    <string>URL to load for empty Second Life searches</string>
+    <string>URL to load for empty searches</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>HideFromEditor</key>
@@ -1006,7 +1006,7 @@
   <key>SearchURLQuery</key>
   <map>
     <key>Comment</key>
-    <string>URL to use for Second Life searches</string>
+    <string>URL to use for searches</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>HideFromEditor</key>
@@ -1032,7 +1032,7 @@
   <key>SearchURLSuffix2</key>
   <map>
     <key>Comment</key>
-    <string>Parameters added to end of Second Life search queries</string>
+    <string>Parameters added to end of search queries</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>HideFromEditor</key>
@@ -1080,7 +1080,7 @@
   <key>ShowcaseURLDefault</key>
   <map>
     <key>Comment</key>
-    <string>URL to load for the Showcase tab in Second Life</string>
+    <string>URL to load for the Showcase tab</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -8347,7 +8347,7 @@
     <key>NumSessions</key>
     <map>
       <key>Comment</key>
-      <string>Number of successful logins to Second Life</string>
+      <string>Number of successful logins to grids</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -11170,7 +11170,7 @@
     <key>SkyUseClassicClouds</key>
     <map>
       <key>Comment</key>
-      <string>Whether to use the old Second Life particle clouds or not</string>
+      <string>Whether to use the old particle clouds or not</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/linden/indra/newview/dronesettings.xml b/linden/indra/newview/dronesettings.xml
index 8a41280..db5749e 100644
--- a/linden/indra/newview/dronesettings.xml
+++ b/linden/indra/newview/dronesettings.xml
@@ -32,7 +32,7 @@
         <LastName value="Tester"/>
         <!--Version number of last instance of the viewer that you ran-->
         <LastRunVersion value="1.7.0"/>
-        <!--Number of successful logins to Second Life-->
+        <!--Number of successful logins to grids-->
         <NumSessions value="27"/>
         <!--Query current hardware configuration on application startup-->
         <ProbeHardwareOnStartup value="FALSE"/>
diff --git a/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh b/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh
index 6b0433a..78e9bcd 100755
--- a/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh
+++ b/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Send a URL of the form secondlife://... to Second Life.
+# Send a URL of the form secondlife://... to the grid.
 #
 
 URL="$1"
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 7555c87..d7b6814 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1803,7 +1803,7 @@ bool LLAppViewer::initConfiguration()
         if(!loadSettingsFromDirectory("Default", set_defaults))
         {
                 std::ostringstream msg;
-                msg << "Second Life could not load its default settings file. \n" 
+                msg << "This viewer could not load its default settings file. \n" 
                     << "The installation may be corrupted. \n";
 
                 OSMessageBox(
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h
index 7b3230a..7c9fe89 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -100,7 +100,7 @@ public:
         
         bool getPurgeCache() const { return mPurgeCache; }
         
-        const std::string& getSecondLifeTitle() const; // The Second Life title.
+        const std::string& getSecondLifeTitle() const; // The viewer title.
         const std::string& getWindowTitle() const; // The window display name.
 
     void forceDisconnect(const std::string& msg); // Force disconnection, with a message to the user.
diff --git a/linden/indra/newview/llappviewerwin32.cpp b/linden/indra/newview/llappviewerwin32.cpp
index 343c1f1..0fc273e 100644
--- a/linden/indra/newview/llappviewerwin32.cpp
+++ b/linden/indra/newview/llappviewerwin32.cpp
@@ -153,7 +153,7 @@ LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *excepti
 // Create app mutex creates a unique global windows object. 
 // If the object can be created it returns true, otherwise
 // it returns false. The false result can be used to determine 
-// if another instance of a second life app (this vers. or later)
+// if another instance of a viewer app (this vers. or later)
 // is running.
 // *NOTE: Do not use this method to run a single instance of the app.
 // This is intended to help debug problems with the cross-platform 
diff --git a/linden/indra/newview/llfloaterfriends.cpp b/linden/indra/newview/llfloaterfriends.cpp
index c33deae..0b4610c 100644
--- a/linden/indra/newview/llfloaterfriends.cpp
+++ b/linden/indra/newview/llfloaterfriends.cpp
@@ -748,7 +748,7 @@ void LLPanelFriends::requestFriendshipDialog(const LLUUID& id,
         LLSD payload;
         payload["id"] = id;
         payload["name"] = name;
-    // Look for server versions like: Second Life Server 1.24.4.95600
+    // Look for server versions like: Grid Server 1.24.4.95600
         if (gLastVersionChannel.find(" 1.24.") != std::string::npos)
         {
                 // Old and busted server version, doesn't support friend
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index 41727f2..d1e6139 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1595,7 +1595,7 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4
         // 'name' is a sender name that we want to hotlink so that clicking on it opens a profile.
         if (!name.empty()) // If name exists, then add it to the front of the message.
         {
-                // Don't hotlink any messages from the system (e.g. "Second Life:"), so just add those in plain text.
+                // Don't hotlink any messages from the system, so just add those in plain text.
                 if (name == SYSTEM_FROM)
                 {
                         mHistoryEditor->appendColoredText(name,false,prepend_newline,color);
diff --git a/linden/indra/newview/llviewermedia.h b/linden/indra/newview/llviewermedia.h
index afda426..43895c9 100644
--- a/linden/indra/newview/llviewermedia.h
+++ b/linden/indra/newview/llviewermedia.h
@@ -156,7 +156,7 @@ public:
         static LLPluginClassMedia* newSourceFromMediaType(std::string media_type, LLPluginClassMediaOwner *owner /* may be NULL */, S32 default_width, S32 default_height);
 
         // Internally set our desired browser user agent string, including
-        // the Second Life version and skin name.  Used because we can
+        // the viewer version and skin name.  Used because we can
         // switch skins without restarting the app.
         static void updateBrowserUserAgent();
 
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 920d42e..6a33aba 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -2172,7 +2172,7 @@ void LLViewerWindow::draw()
 
                 if( gShowOverlayTitle && !mOverlayTitle.empty() )
                 {
-                        // Used for special titles such as "Second Life - Special E3 2003 Beta"
+                        // Used for special titles such as "MyViewer - Special E3 2003 Beta"
                         const S32 DIST_FROM_TOP = 20;
                         LLFontGL::getFontSansSerifBig()->renderUTF8(
                                 mOverlayTitle, 0,
diff --git a/linden/indra/newview/llviewerwindow.h b/linden/indra/newview/llviewerwindow.h
index d26d820..53d346b 100644
--- a/linden/indra/newview/llviewerwindow.h
+++ b/linden/indra/newview/llviewerwindow.h
@@ -418,7 +418,7 @@ protected:
         LLRect                  mPickScreenRegion; // area of frame buffer for rendering pick frames (generally follows mouse to avoid going offscreen)
         LLTimer         mPickTimer;        // timer for scheduling n picks per second
 
-        std::string             mOverlayTitle;          // Used for special titles such as "Second Life - Special E3 2003 Beta"
+        std::string             mOverlayTitle;          // Used for special titles such as "MyViewer - Special E3 2003 Beta"
 
         BOOL                    mIgnoreActivate;
 
diff --git a/linden/indra/newview/skins/default/html/en-us/loading-error/index.html b/linden/indra/newview/skins/default/html/en-us/loading-error/index.html
index 71f9c86..9898149 100644
--- a/linden/indra/newview/skins/default/html/en-us/loading-error/index.html
+++ b/linden/indra/newview/skins/default/html/en-us/loading-error/index.html
@@ -19,10 +19,10 @@ a:hover {color:#ff7900;text-decoration:underline;}
 <div id="infobox">
         <img src="../../unabletoconnect.png"><br/>
                 <p>
-                        Second Life can't establish a connection to the login server.
+                        This viewer can't establish a connection to the login server.
                 </p>
                 <p>
-                        Please check your internet connection. If your computer or network is protected by a firewall or proxy, make sure that Second Life is permitted to access the network.
+                        Please check your internet connection. If your computer or network is protected by a firewall or proxy, make sure that this viewer is permitted to access the network.
                 </p>
                 <div id="submitbtn">
                         <input class="input_over" type="submit" value="Try Again" onclick="document.location='secondlife:///app/login_refresh'; this.className='pressed';" onmouseover="this.className='input_over';" onmouseout="this.className='input_off';" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 36a8f93..be29df8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -3686,7 +3686,7 @@ Default: off
  label="Max Inventory Items To Transfer"
  name="HelpMaxInventoryItemsTransfer"
  type="alertmodal">
-This box controls how many objects can be transfered between clients at a time. -1 sets no limit on the amount of objects. Default Second Life setting is 42.
+This box controls how many objects can be transfered between clients at a time. -1 sets no limit on the amount of objects. Default setting is 42.
 
 Default: -1
 </notification>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 0df65e7..38c5a98 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -103,7 +103,7 @@
                              bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
                              mouse_opaque="true" name="partner_label"
-                             tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
+                             tool_tip="In world partner."
                              v_pad="0" width="145">
         Partner:
       </text>
@@ -118,7 +118,7 @@
                              border_thickness="1" bottom_delta="-19" enabled="true" follows="left|top"
                              font="SansSerifSmall" height="18" is_unicode="false" right="-12"
                              max_length="254" mouse_opaque="false" name="partner_edit"
-                             tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
+                             tool_tip="In world partner."
                              width="145">
         [FIRST] [LAST]
       </line_editor>
@@ -295,7 +295,7 @@
                              bottom="-20" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
                              mouse_opaque="true"
-                             name="Tell everyone about your favorite places in Second Life." v_pad="0"
+                             name="Tell everyone about your favorite places in world." v_pad="0"
                              width="302">
         Tell everyone about your favorite places.
       </text>
@@ -321,7 +321,7 @@
                              bottom="-20" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
                              mouse_opaque="true"
-                             name="Place an ad in Second Life&apos;s classified listings." v_pad="0"
+                             name="Place an ad in the classified listings." v_pad="0"
                              width="302">
         Place an ad in the current grid&apos;s classified listings.
       </text>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
index 46283bb..e077ca1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
@@ -9,7 +9,7 @@
                         Use external web browser (Firefox, Safari, Internet Explorer)
                 </radio_item>
                 <radio_item bottom="-40" height="20" left="0" name="internal" width="480" 
-                  tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside Second Life.">
+                  tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside the viewer.">
                         Use built-in web browser
                 </radio_item>
         </radio_group>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
index 46ba64a..0169f38 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_status_bar.xml
@@ -101,7 +101,7 @@
         <button bottom="-17" enabled="true" follows="right|bottom" font="SansSerifSmall"
              halign="center" height="16" image_unselected="status_search_btn.png" image_selected="status_search_btn_pressed.png" image_disabled_selected="status_search_btn_pressed.png" image_disabled="status_search_btn.png"
              label="" label_selected="" left="-16" mouse_opaque="true" name="search_btn"
-             tool_tip="Search Second Life" width="16" scale_image="false"/>
+             tool_tip="Search the grid" width="16" scale_image="false"/>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-16" enabled="false" follows="right|bottom" font="SansSerifSmall"
              halign="center" height="12" left="-20" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml b/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml
index 147a5f6..3cbb74b 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_avatar.xml
@@ -138,7 +138,7 @@
                 </panel>
                 <panel label="ピック" name="Picks">
                         <tab_container name="picks tab" />
-                        <text name="Tell everyone about your favorite places in Second Life.">
+                        <text name="Tell everyone about your favorite places in world.">
                                 Second Lifeのお気入りの場所を皆に教えてください
                         </text>
                         <button label="新規..." label_selected="新規..." name="New..."/>
@@ -149,7 +149,7 @@
                 </panel>
                 <panel label="広告" name="Classified">
                         <tab_container name="classified tab" />
-                        <text name="Place an ad in Second Life&apos;s classified listings.">
+                        <text name="Place an ad in the classified listings.">
                                 SecondLifeのクラシファイドリストに広告を載せます。
                         </text>
                         <button label="新規..." label_selected="新規..." name="New..."/>
diff --git a/linden/indra/test/llsdserialize_tut.cpp b/linden/indra/test/llsdserialize_tut.cpp
index 6fcbe4b..3e9e4b8 100644
--- a/linden/indra/test/llsdserialize_tut.cpp
+++ b/linden/indra/test/llsdserialize_tut.cpp
@@ -315,25 +315,7 @@ namespace tut
                 checkRoundTrip(msg + " non-empty string", v);
                 
                 v =
-"Second Life is a 3-D virtual world entirely built and owned by its residents. "
-"Since opening to the public in 2003, it has grown explosively and today is "
-"inhabited by nearly 100,000 people from around the globe.\n"
-"\n"
-"From the moment you enter the World you'll discover a vast digital continent, "
-"teeming with people, entertainment, experiences and opportunity. Once you've "
-"explored a bit, perhaps you'll find a perfect parcel of land to build your "
-"house or business.\n"
-"\n"
-"You'll also be surrounded by the Creations of your fellow residents. Because "
-"residents retain the rights to their digital creations, they can buy, sell "
-"and trade with other residents.\n"
-"\n"
-"The Marketplace currently supports millions of US dollars in monthly "
-"transactions. This commerce is handled with the in-world currency, the Linden "
-"dollar, which can be converted to US dollars at several thriving online "
-"currency exchanges.\n"
-"\n"
-"Welcome to Second Life. We look forward to seeing you in-world!\n"
+"Welcome to this grid. We look forward to seeing you in-world!\n"
                 ;
                 checkRoundTrip(msg + " long string", v);
 
diff --git a/linden/indra/test/lluri_tut.cpp b/linden/indra/test/lluri_tut.cpp
index 2ee15be..5f0d4e5 100644
--- a/linden/indra/test/lluri_tut.cpp
+++ b/linden/indra/test/lluri_tut.cpp
@@ -306,7 +306,7 @@ namespace tut
         void URITestObject::test<17>()
         {
                 // do some round-trip tests with very long strings.
-                escapeRoundTrip("Welcome to Second Life.We hope you'll have a richly rewarding experience, filled with creativity, self expression and fun.The goals of the Community Standards are simple: treat each other with respect and without harassment, adhere to local standards as indicated by simulator ratings, and refrain from any hate activity which slurs a real-world individual or real-world community. Behavioral Guidelines - The Big Six");
+                escapeRoundTrip("Welcome to this grid.We hope you'll have a richly rewarding experience, filled with creativity, self expression and fun.  The goals of the Community Standards are simple: treat each other with respect and without harassment, adhere to local standards as indicated by simulator ratings, and refrain from any hate activity which slurs a real-world individual or real-world community.");
                 escapeRoundTrip(
                         "'asset_data':b(12100){'task_id':ucc706f2d-0b68-68f8-11a4-f1043ff35ca0}\n{\n\tname\tObject|\n\tpermissions 0\n\t{\n\t\tbase_mask\t7fffffff\n\t\towner_mask\t7fffffff\n\t\tgroup_mask\t00000000\n\t\teveryone_mask\t00000000\n\t\tnext_owner_mask\t7fffffff\n\t\tcreator_id\t13fd9595-a47b-4d64-a5fb-6da645f038e0\n\t\towner_id\t3c115e51-04f4-523c-9fa6-98aff1034730\n\t\tlast_owner_id\t3c115e51-04f4-523c-9fa6-98aff1034730\n\t\tgroup_id\t00000000-0000-0000-0000-000000000000\n\t}\n\tlocal_id\t217444921\n\ttotal_crc\t323\n\ttype\t2\n\ttask_valid\t2\n\ttravel_access\t13\n\tdisplayopts\t2\n\tdisplaytype\tv\n\tpos\t-0.368634403\t0.00781063363\t-0.569040775\n\toldpos\t150.117996\t25.8658009\t8.19664001\n\trotation\t-0.06293071806430816650390625\t-0.6995697021484375\t-0.7002241611480712890625\t0.1277817934751510620117188\n\tchildpos\t-0.00499999989\t-0.0359999985\t0.307999998\n\tchildrot\t-0.515492737293243408203125\t-0.46601200103759765625\t0.529055416584014892578125\t0.4870323240756988525390625\n\tscale"
                         "\t0.074629\t0.289956\t0.01\n\tsit_offset\t0\t0\t0\n\tcamera_eye_offset\t0\t0\t0\n\tcamera_at_offset\t0\t0\t0\n\tsit_quat\t0\t0\t0\t1\n\tsit_hint\t0\n\tstate\t160\n\tmaterial\t3\n\tsoundid\t00000000-0000-0000-0000-000000000000\n\tsoundgain\t0\n\tsoundradius\t0\n\tsoundflags\t0\n\ttextcolor\t0 0 0 1\n\tselected\t0\n\tselector\t00000000-0000-0000-0000-000000000000\n\tusephysics\t0\n\trotate_x\t1\n\trotate_y\t1\n\trotate_z\t1\n\tphantom\t0\n\tremote_script_access_pin\t0\n\tvolume_detect\t0\n\tblock_grabs\t0\n\tdie_at_edge\t0\n\treturn_at_edge\t0\n\ttemporary\t0\n\tsandbox\t0\n\tsandboxhome\t0\t0\t0\n\tshape 0\n\t{\n\t\tpath 0\n\t\t{\n\t\t\tcurve\t16\n\t\t\tbegin\t0\n\t\t\tend\t1\n\t\t\tscale_x\t1\n\t\t\tscale_y\t1\n\t\t\tshear_x\t0\n\t\t\tshear_y\t0\n\t\t\ttwist\t0\n\t\t\ttwist_begin\t0\n\t\t\tradius_offset\t0\n\t\t\ttaper_x\t0\n\t\t\ttaper_y\t0\n\t\t\trevolutions\t1\n\t\t\tskew\t0\n\t\t}\n\t\tprofile 0\n\t\t{\n\t\t\tcurve\t1\n\t\t\tbegin\t0\n\t\t\tend\t1\n\t\t\thollow\t0\n\t\t}\n\t}\n\tf"
diff --git a/linden/indra/win_updater/updater.cpp b/linden/indra/win_updater/updater.cpp
index 2e78296..117b8e8 100644
--- a/linden/indra/win_updater/updater.cpp
+++ b/linden/indra/win_updater/updater.cpp
@@ -482,7 +482,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho
         //char params[256];             /* Flawfinder: ignore */
         //sprintf(params, "/S");        /* Flawfinder: ignore */
         //MessageBox(gWindow, 
-        //      L"Updating Second Life.\n\nSecond Life will automatically start once the update is complete.  This may take a minute...",
+        //      L"Updating grid viewer.\n\n The grid viewer will automatically start once the update is complete.  This may take a minute...",
         //      L"Download Complete",
         //      MB_OK);