Unbranding word of the day is "Second Life".

7 files changed, 12 insertions, 11 deletions

diff --git a/linden/indra/llmessage/llinstantmessage.cpp b/linden/indra/llmessage/llinstantmessage.cpp
index 44be3ae..30205d8 100644
--- a/linden/indra/llmessage/llinstantmessage.cpp
+++ b/linden/indra/llmessage/llinstantmessage.cpp
@@ -60,6 +60,7 @@ const S32 VOTE_UNANIMOUS = 2;
 const char EMPTY_BINARY_BUCKET[] = "";
 const S32 EMPTY_BINARY_BUCKET_SIZE = 1;
 const U32 NO_TIMESTAMP = 0;
+// Damn, this seems to be hard coded into the protocol.
 const std::string SYSTEM_FROM("Second Life");
 const S32 IM_TTL = 1;
 
diff --git a/linden/indra/llui/lluistring.h b/linden/indra/llui/lluistring.h
index aedeca2..adc2e08 100644
--- a/linden/indra/llui/lluistring.h
+++ b/linden/indra/llui/lluistring.h
@@ -45,14 +45,14 @@
 //  the correct result
 
 // Example Usage:
-// LLUIString mMessage("Welcome [USERNAME] to [SECONDLIFE]!");
+// LLUIString mMessage("Welcome [USERNAME] to [GRIDNAME]!");
 // mMessage.setArg("[USERNAME]", "Steve");
-// mMessage.setArg("[SECONDLIFE]", "Second Life");
-// llinfos << mMessage.getString() << llendl; // outputs "Welcome Steve to Second Life"
+// mMessage.setArg("[GRIDNAME]", "This Grid");
+// llinfos << mMessage.getString() << llendl; // outputs "Welcome Steve to This Grid"
 // mMessage.setArg("[USERNAME]", "Joe");
-// llinfos << mMessage.getString() << llendl; // outputs "Welcome Joe to Second Life"
-// mMessage = "Recepci￳n a la [SECONDLIFE] [USERNAME]"
-// mMessage.setArg("[SECONDLIFE]", "Segunda Vida");
+// llinfos << mMessage.getString() << llendl; // outputs "Welcome Joe to This Grid"
+// mMessage = "Recepci￳n a la [GRIDNAME] [USERNAME]"
+// mMessage.setArg("[GRIDNAME]", "Segunda Vida");
 // llinfos << mMessage.getString() << llendl; // outputs "Recepci￳n a la Segunda Vida Joe"
 
 // Implementation Notes:
diff --git a/linden/indra/mac_crash_logger/mac_crash_logger.cpp b/linden/indra/mac_crash_logger/mac_crash_logger.cpp
index 1f5663d..464cc5d 100644
--- a/linden/indra/mac_crash_logger/mac_crash_logger.cpp
+++ b/linden/indra/mac_crash_logger/mac_crash_logger.cpp
@@ -38,7 +38,7 @@ int main(int argc, char **argv)
 {
         //time(&gLaunchTime);
         
-        llinfos << "Starting Second Life Viewer Crash Reporter" << llendl;
+        llinfos << "Starting Crash Reporter" << llendl;
 
         LLCrashLoggerMac app;
         app.parseCommandOptions(argc, argv);
diff --git a/linden/indra/newview/llappviewermacosx.cpp b/linden/indra/newview/llappviewermacosx.cpp
index d81b6e3..5496e5b 100644
--- a/linden/indra/newview/llappviewermacosx.cpp
+++ b/linden/indra/newview/llappviewermacosx.cpp
@@ -300,7 +300,7 @@ static OSStatus CarbonEventHandler(EventHandlerCallRef inHandlerCallRef,
 void LLAppViewerMacOSX::handleCrashReporting(bool reportFreeze)
 {
         // This used to use fork&exec, but is switched to LSOpenApplication to 
-        // Make sure the crash reporter launches in front of the SL window.
+        // Make sure the crash reporter launches in front of the viewer window.
         
         std::string command_str;
         //command_str = "open Second Life.app/Contents/Resources/mac-crash-logger.app";
diff --git a/linden/indra/newview/llmediactrl.cpp b/linden/indra/newview/llmediactrl.cpp
index cc9fec6..51b0929 100644
--- a/linden/indra/newview/llmediactrl.cpp
+++ b/linden/indra/newview/llmediactrl.cpp
@@ -888,7 +888,7 @@ void LLMediaCtrl::onClickLinkHref( LLPluginClassMedia* self )
 //                              const bool open_links_externally = false;
 //                              LLFloaterHtml::getInstance()->show( 
 //                                      event_in.mStringPayload, 
-//                                              "Second Life Browser",
+//                                              "Viewer Browser",
 //                                                      open_links_externally,
 //                                                              mTrusted);
                         }
diff --git a/linden/indra/newview/llviewertexteditor.h b/linden/indra/newview/llviewertexteditor.h
index c69b3f0..9d30e4f 100644
--- a/linden/indra/newview/llviewertexteditor.h
+++ b/linden/indra/newview/llviewertexteditor.h
@@ -85,7 +85,7 @@ public:
         void setEmbeddedText(const std::string& instr);
         std::string getEmbeddedText();
         
-        // Appends Second Life time, small font, grey.
+        // Appends grid time, small font, grey.
         // If this starts a line, you need to prepend a newline.
         std::string appendTime(bool prepend_newline);
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index ef02bfa..3485684 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -2,7 +2,7 @@
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="false" height="440" min_height="100" min_width="100"
      name="floater_about" rect_control="FloaterAboutRect"
-     title="About Second Life" width="470">
+     title="About grid viewer" width="470">
         <text_editor bottom="-434" embedded_items="false"
              follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
   max_length="65536" mouse_opaque="true" name="credits_editor" width="458"