diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index d94b4fbcab3893ec705b4b4be1b83e5668231328..0b692af99c672242b91d8f270a7267ad0bd0ae26 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -400,6 +400,7 @@ static std::set<std::string> default_trans_args;
void init_default_trans_args()
{
default_trans_args.insert("SECOND_LIFE"); // World
+ default_trans_args.insert("CURRENT_GRID");
default_trans_args.insert("APP_NAME");
default_trans_args.insert("CAPITALIZED_APP_NAME");
default_trans_args.insert("SECOND_LIFE_GRID");
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
index e1e7a0d92fa30e8666ef585783c560a9a1e8d082..733128616de99a5ee8b075e9011b0e6fe2294476 100755
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@@ -636,6 +636,7 @@ void LLGridManager::setGridChoice(const std::string& grid)
LL_INFOS("GridManager")<<"setting "<<grid_name<<LL_ENDL;
mGrid = grid_name;
gSavedSettings.setString("CurrentGrid", grid_name);
+ LLTrans::setDefaultArg("CURRENT_GRID", getGridLabel());
updateIsInProductionGrid();
}
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 5b922a81cf3fc41ceff01f5bd7659066547171ee..7f50d1ef248579f3eb234e956e81b6734dd79286 100755
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -46,52 +46,73 @@
label="Quickstart"
name="Quickstart">
<menu_item_call.on_click
- function="Advanced.ShowURL"
- parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Quickstart/ta-p/1087919"/>
+ function="Advanced.ShowURL"
+ parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Quickstart/ta-p/1087919"/>
+ <menu_item_call.on_visible
+ function="EnableGrid"
+ parameter="secondlife" />
</menu_item_call>
<menu_item_separator/>
<menu_item_call
- label="Knowledge Base"
+ label="Second Life Knowledge Base"
name="Knowledge Base">
<menu_item_call.on_click
function="Advanced.ShowURL"
- parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-User-s-Guide/ta-p/1244857"/>
+ parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-User-s-Guide/ta-p/1244857"/>
+ <menu_item_call.on_visible
+ function="EnableGrid"
+ parameter="secondlife" />
</menu_item_call>
<menu_item_call
- label="Wiki"
+ label="Second Life Wiki"
name="Wiki">
<menu_item_call.on_click
function="Advanced.ShowURL"
parameter="http://wiki.secondlife.com"/>
+ <menu_item_call.on_visible
+ function="EnableGrid"
+ parameter="secondlife" />
</menu_item_call>
<menu_item_call
- label="Community Forums"
+ label="Second Life Community Forums"
name="Community Forums">
<menu_item_call.on_click
function="Advanced.ShowURL"
parameter="http://community.secondlife.com/t5/Forums/ct-p/Forums"/>
- </menu_item_call>
+ <menu_item_call.on_visible
+ function="EnableGrid"
+ parameter="secondlife" />
+ </menu_item_call>
<menu_item_call
- label="Support portal"
+ label="Second Life Support portal"
name="Support portal">
<menu_item_call.on_click
function="Advanced.ShowURL"
- parameter="https://support.secondlife.com/"/>
+ parameter="https://support.secondlife.com/"/>
+ <menu_item_call.on_visible
+ function="EnableGrid"
+ parameter="secondlife" />
</menu_item_call>
<menu_item_separator/>
<menu_item_call
- label="[SECOND_LIFE] News"
+ label="Second Life News"
name="Second Life News">
<menu_item_call.on_click
function="Advanced.ShowURL"
- parameter="http://community.secondlife.com/t5/Featured-News/bg-p/blog_feature_news"/>
+ parameter="http://community.secondlife.com/t5/Featured-News/bg-p/blog_feature_news"/>
+ <menu_item_call.on_visible
+ function="EnableGrid"
+ parameter="secondlife" />
</menu_item_call>
<menu_item_call
- label="[SECOND_LIFE] Blogs"
+ label="Second Life Blogs"
name="Second Life Blogs">
<menu_item_call.on_click
function="Advanced.ShowURL"
parameter="http://community.secondlife.com/t5/Blogs/ct-p/Blogs"/>
+ <menu_item_call.on_visible
+ function="EnableGrid"
+ parameter="secondlife" />
</menu_item_call>
<menu_item_separator/>
<menu_item_call
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index b1966e43a984cb1ad05f2ebc4695bdc131f7b863..ac5bec7b842c7201a5f72c49bc6671b2b3e9eddb 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1502,7 +1502,7 @@
</menu_item_call>
<menu_item_separator/>
<menu_item_call
- label="[SECOND_LIFE] Knowledge Base"
+ label="Second Life Knowledge Base"
name="Knowledge Base">
<menu_item_call.on_click
function="Advanced.ShowURL"
@@ -1512,7 +1512,7 @@
parameter="secondlife" />
</menu_item_call>
<menu_item_call
- label="[SECOND_LIFE] Wiki"
+ label="Second Life Wiki"
name="Wiki">
<menu_item_call.on_click
function="Advanced.ShowURL"
@@ -1522,7 +1522,7 @@
parameter="secondlife" />
</menu_item_call>
<menu_item_call
- label="[SECOND_LIFE] Community Forums"
+ label="Second Life Community Forums"
name="Community Forums">
<menu_item_call.on_click
function="Advanced.ShowURL"
@@ -1532,7 +1532,7 @@
parameter="secondlife" />
</menu_item_call>
<menu_item_call
- label="[SECOND_LIFE] Support portal"
+ label="Second Life Support portal"
name="Support portal">
<menu_item_call.on_click
function="Advanced.ShowURL"
@@ -1543,7 +1543,7 @@
</menu_item_call>
<menu_item_separator />
<menu_item_call
- label="[SECOND_LIFE] News"
+ label="Second Life News"
name="Second Life News">
<menu_item_call.on_click
function="Advanced.ShowURL"
@@ -1553,7 +1553,7 @@
parameter="secondlife" />
</menu_item_call>
<menu_item_call
- label="[SECOND_LIFE] Blogs"
+ label="Second Life Blogs"
name="Second Life Blogs">
<menu_item_call.on_click
function="Advanced.ShowURL"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9182236bf88645fbff0fd701b6402fd41c050432..9dade861b005358ba4bc12aca2c83d1f51f42493 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -932,7 +932,7 @@ Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NA
icon="alertmodal.tga"
name="ConfirmLandSaleToAnyoneChange"
type="alertmodal">
-ATTENTION: Clicking 'sell to anyone' makes your land available to the entire [SECOND_LIFE] community, even those not in this region.
+ATTENTION: Clicking 'sell to anyone' makes your land available to the entire [CURRENT_GRID] community, even those not in this region.
The selected [LAND_SIZE] m² land is being set for sale.
Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].
@@ -1159,7 +1159,7 @@ There was a problem uploading a report screenshot due to the following reason: [
name="MustAgreeToLogIn"
type="alertmodal">
<tag>fail</tag>
-You must agree to the Terms of Service to continue logging into [SECOND_LIFE].
+You must agree to the Terms of Service to continue logging into [CURRENT_GRID].
</notification>
<notification
@@ -1204,7 +1204,7 @@ You can not wear that item because it has not yet loaded. Please try again in a
Oops! Something was left blank.
You need to enter the Username name of your avatar.
-You need an account to enter [SECOND_LIFE]. Would you like to create one now?
+You need an account to enter [CURRENT_GRID]. Would you like to create one now?
<tag>confirm</tag>
<url
option="0"
@@ -1322,7 +1322,7 @@ Delete pick <nolink>[PICK]</nolink>?
icon="alertmodal.tga"
name="PromptGoToEventsPage"
type="alertmodal">
-Go to the [SECOND_LIFE] events web page?
+Go to the [CURRENT_GRID] events web page?
<tag>confirm</tag>
<url option="0" name="url">
@@ -1414,7 +1414,7 @@ Changing language will take effect after you restart [APP_NAME].
icon="alertmodal.tga"
name="GoToAuctionPage"
type="alertmodal">
- Go to the [SECOND_LIFE] web page to see auction details or make a bid?
+ Go to the [CURRENT_GRID] web page to see auction details or make a bid?
<tag>confirm</tag>
<url option="0" name="url">
http://secondlife.com/auctions/auction-detail.php?id=[AUCTION_ID]
@@ -2735,7 +2735,7 @@ This is usually a temporary failure. Please customize and save the wearable agai
icon="alertmodal.tga"
name="YouHaveBeenLoggedOut"
type="alertmodal">
-Darn. You have been logged out of [SECOND_LIFE]
+Darn. You have been logged out of [CURRENT_GRID]
[MESSAGE]
<usetemplate
name="okcancelbuttons"
@@ -3297,7 +3297,7 @@ You may want to set a new home location.
type="alertmodal">
<tag>fail</tag>
Your clothing is still downloading.
-You can use [SECOND_LIFE] normally and other people will see you correctly.
+You can use [CURRENT_GRID] normally and other people will see you correctly.
<form name="form">
<ignore name="ignore"
text="Clothing is taking a long time to download"/>
@@ -3311,7 +3311,7 @@ You can use [SECOND_LIFE] normally and other people will see you correctly.
[APP_NAME] installation is complete.
-If this is your first time using [SECOND_LIFE], you will need to create an account before you can log in.
+If this is your first time using [CURRENT_GRID], you will need to create an account before you can log in.
<tag>confirm</tag>
<usetemplate
name="okcancelbuttons"
@@ -3355,7 +3355,7 @@ You can either check your Internet connection and try again in a few minutes, cl
Your character will appear in a moment.
Use arrow keys to walk.
-Press the F1 key at any time for help or to learn more about [SECOND_LIFE].
+Press the F1 key at any time for help or to learn more about [CURRENT_GRID].
Please choose the male or female avatar. You can change your mind later.
<usetemplate
name="okcancelbuttons"
@@ -3950,7 +3950,7 @@ Go to your [http://secondlife.com/account/ Dashboard] to manage your account?
icon="alertmodal.tga"
name="WebLaunchSecurityIssues"
type="alertmodal">
-Visit the [SECOND_LIFE] Wiki for details of how to report a security issue.
+Visit the [CURRENT_GRID] Wiki for details of how to report a security issue.
<tag>confirm</tag>
<usetemplate
ignoretext="Launch my browser to learn how to report a Security Issue"
@@ -3963,7 +3963,7 @@ Visit the [SECOND_LIFE] Wiki for details of how to report a security issue.
icon="alertmodal.tga"
name="WebLaunchQAWiki"
type="alertmodal">
-Visit the [SECOND_LIFE] QA Wiki.
+Visit the [CURRENT_GRID] QA Wiki.
<tag>confirm</tag>
<usetemplate
ignoretext="Launch my browser to view the QA Wiki"
@@ -3976,7 +3976,7 @@ Visit the [SECOND_LIFE] QA Wiki.
icon="alertmodal.tga"
name="WebLaunchPublicIssue"
type="alertmodal">
-Visit the [SECOND_LIFE] Public Issue Tracker, where you can report bugs and other issues.
+Visit the [CURRENT_GRID] Public Issue Tracker, where you can report bugs and other issues.
<tag>confirm</tag>
<usetemplate
ignoretext="Launch my browser to use the Public Issue Tracker"
@@ -5765,9 +5765,9 @@ Dear Resident,
You appear to be reporting intellectual property infringement. Please make sure you are reporting it correctly:
-(1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the [SECOND_LIFE] permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the [SECOND_LIFE] [http://secondlife.com/corporate/tos.php Terms of Service] or [http://secondlife.com/corporate/cs.php Community Standards]. However, the Abuse Team does not handle and will not respond to requests to remove content from the [SECOND_LIFE] world.
+(1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the [CURRENT_GRID] permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the [CURRENT_GRID] [http://secondlife.com/corporate/tos.php Terms of Service] or [http://secondlife.com/corporate/cs.php Community Standards]. However, the Abuse Team does not handle and will not respond to requests to remove content from the [CURRENT_GRID] world.
-(2) The DMCA or Content Removal Process. To request removal of content from [SECOND_LIFE], you MUST submit a valid notification of infringement as provided in our [http://secondlife.com/corporate/dmca.php DMCA Policy].
+(2) The DMCA or Content Removal Process. To request removal of content from [CURRENT_GRID], you MUST submit a valid notification of infringement as provided in our [http://secondlife.com/corporate/dmca.php DMCA Policy].
If you still wish to continue with the abuse process, please close this window and finish submitting your report. You may need to select the specific category 'CopyBot or Permissions Exploit'.
@@ -6117,7 +6117,7 @@ Would you like to automatically wear the clothing you are about to create?
icon="alertmodal.tga"
name="Cannot enter parcel: no payment info on file"
type="alertmodal">
-You must have payment information on file to visit this area. Do you want to go to the [SECOND_LIFE] website and set this up?
+You must have payment information on file to visit this area. Do you want to go to the [CURRENT_GRID] website and set this up?
[_URL]
<tag>confirm</tag>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index 2c7c8133d139125ab611f159c346a84adc25988f..6d486a00d2d4c66e04b7a58855af845ef89e734f 100755
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -210,7 +210,7 @@
top="10"
name="second_life_photo_title_text"
text_color="white"
- value="[SECOND_LIFE]:"
+ value="[CURRENT_GRID]:"
width="100" />
<texture_picker
allow_no_texture="true"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
index 975b08be053713600d025efb189e8d6467622826..30dd7a4195053b9a08a85ad9384581bee711949e 100755
--- a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml
@@ -6,7 +6,7 @@
width="490">
<string
name="default_subject">
- Postcard from [SECOND_LIFE].
+ Postcard from [CURRENT_GRID].
</string>
<string
name="default_message">
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ba515dbf21aab596cce42864719ba420ff6c9a5d..755af6c360e84281ccfdfcd5806e68151856e2d5 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -6,11 +6,12 @@
<strings>
<!-- Default Args - these arguments will be replaced in all strings -->
- <string name="SECOND_LIFE">Second Life</string>
+ <string name="SECOND_LIFE">[CURRENT_GRID]</string> <!-- I'd like to drop this but server supplied strings use it -->
<string name="APP_NAME">Alchemy</string>
<string name="CAPITALIZED_APP_NAME">ALCHEMY</string>
<string name="SECOND_LIFE_GRID">Second Life Grid</string>
<string name="SUPPORT_SITE">Second Life Support Portal</string>
+ <string name="CURRENT_GRID"/> <!-- Set in LLViewerNetwork -->
<!-- starting up -->
<string name="StartupDetectingHardware">Detecting hardware...</string>
@@ -870,7 +871,7 @@ Returns the rotation velocity in radians per second
</string>
<string name="LSLTipText_llGetTimeOfDay" translate="false">
float llGetTimeOfDay()
-Returns the time in seconds since [SECOND_LIFE] server midnight or since region up-time, whichever is smaller
+Returns the time in seconds since [CURRENT_GRID] server midnight or since region up-time, whichever is smaller
</string>
<string name="LSLTipText_llGetWallclock" translate="false">
float llGetWallclock()