UNBRANDING! Conservativley remove references to "second life", replacing them with something generic.

3 files changed, 20 insertions, 23 deletions

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"