From e68da291f855b1d8dd0012af67f172a2244936c2 Mon Sep 17 00:00:00 2001 From: David Seikel Date: Sun, 13 Feb 2011 14:37:44 +1000 Subject: UNBRANDING! Conservativley remove references to "second life", replacing them with something generic. --- linden/indra/newview/app_settings/settings.xml | 12 ++++++------ linden/indra/newview/dronesettings.xml | 2 +- .../indra/newview/linux_tools/handle_secondlifeprotocol.sh | 2 +- linden/indra/newview/llappviewer.cpp | 2 +- linden/indra/newview/llappviewer.h | 2 +- linden/indra/newview/llappviewerwin32.cpp | 2 +- linden/indra/newview/llfloaterfriends.cpp | 2 +- linden/indra/newview/llimpanel.cpp | 2 +- linden/indra/newview/llviewermedia.h | 2 +- linden/indra/newview/llviewerwindow.cpp | 2 +- linden/indra/newview/llviewerwindow.h | 2 +- .../skins/default/html/en-us/loading-error/index.html | 4 ++-- .../indra/newview/skins/default/xui/en-us/notifications.xml | 2 +- .../indra/newview/skins/default/xui/en-us/panel_avatar.xml | 8 ++++---- .../skins/default/xui/en-us/panel_preferences_web.xml | 2 +- .../newview/skins/default/xui/en-us/panel_status_bar.xml | 2 +- linden/indra/newview/skins/default/xui/ja/panel_avatar.xml | 4 ++-- 17 files changed, 27 insertions(+), 27 deletions(-) (limited to 'linden/indra/newview') 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 @@ SearchURLDefault Comment - URL to load for empty Second Life searches + URL to load for empty searches Persist 1 HideFromEditor @@ -1006,7 +1006,7 @@ SearchURLQuery Comment - URL to use for Second Life searches + URL to use for searches Persist 1 HideFromEditor @@ -1032,7 +1032,7 @@ SearchURLSuffix2 Comment - Parameters added to end of Second Life search queries + Parameters added to end of search queries Persist 1 HideFromEditor @@ -1080,7 +1080,7 @@ ShowcaseURLDefault Comment - URL to load for the Showcase tab in Second Life + URL to load for the Showcase tab Persist 1 Type @@ -8347,7 +8347,7 @@ NumSessions Comment - Number of successful logins to Second Life + Number of successful logins to grids Persist 1 Type @@ -11170,7 +11170,7 @@ SkyUseClassicClouds Comment - Whether to use the old Second Life particle clouds or not + Whether to use the old particle clouds or not Persist 1 Type 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 @@ - + 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;}

- Second Life can't establish a connection to the login server. + This viewer can't establish a connection to the login server.

- 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.

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 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: @@ -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] @@ -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. @@ -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'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's classified listings. 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) + 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 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 @@