From 8cc8e7dc77c7aff6d4698632d6a3bebe76698ff7 Mon Sep 17 00:00:00 2001
From: dolphin <dolphin@lindenlab.com>
Date: Tue, 28 Oct 2014 11:43:45 -0700
Subject: ACME-1601: Updated message to match behavior ACME-1616: Change
 references of "Grid-Wide" to "Grid-Scope" and "non Grid-Wide"  to
 "Land-Scope"

---
 indra/newview/llfloaterexperienceprofile.cpp               | 14 ++++++++++----
 indra/newview/llviewermessage.cpp                          |  4 ++--
 indra/newview/skins/default/xui/en/notifications.xml       |  2 +-
 .../skins/default/xui/en/panel_region_experiences.xml      |  8 ++++----
 indra/newview/skins/default/xui/en/strings.xml             |  3 ++-
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/indra/newview/llfloaterexperienceprofile.cpp b/indra/newview/llfloaterexperienceprofile.cpp
index 4ee31f5df1..197162487d 100644
--- a/indra/newview/llfloaterexperienceprofile.cpp
+++ b/indra/newview/llfloaterexperienceprofile.cpp
@@ -520,13 +520,19 @@ void LLFloaterExperienceProfile::refreshExperience( const LLSD& experience )
 
     enable = getChild<LLCheckBoxCtrl>(EDIT BTN_PRIVATE);
     enable->set(properties & LLExperienceCache::PROPERTY_PRIVATE);  
+
+    topPanel->setVisible(TRUE);
+    child=getChild<LLTextBox>(TF_GRID_WIDE);
+    child->setVisible(TRUE);
+
     if(properties & LLExperienceCache::PROPERTY_GRID)
     {
-        topPanel->setVisible(TRUE);
-        child=getChild<LLTextBox>(TF_GRID_WIDE);
-        child->setVisible(TRUE);
-        child->setText(LLTrans::getString("GRID_WIDE"));
+        child->setText(LLTrans::getString("Grid-Scope"));
     }
+	else 
+	{
+        child->setText(LLTrans::getString("Land-Scope"));
+	}
 
 	if(getChild<LLButton>(BTN_EDIT)->getVisible())
 	{
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index a0b7e78369..d99d2b2990 100755
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -6491,11 +6491,11 @@ void process_script_experience_details(const LLSD& experience_details, LLSD args
 {
 	if(experience_details[LLExperienceCache::PROPERTIES].asInteger() & LLExperienceCache::PROPERTY_GRID)
 	{
-		args["GRID_WIDE"] = LLTrans::getString("GRID_WIDE")+ " ";
+		args["GRID_WIDE"] = LLTrans::getString("Grid-Scope");
 	}
 	else
 	{
-		args["GRID_WIDE"] = "";
+		args["GRID_WIDE"] = LLTrans::getString("Land-Scope");
 	}
 	args["EXPERIENCE"] = LLSLURL("experience", experience_details[LLExperienceCache::EXPERIENCE_ID].asUUID(), "profile").getSLURLString();
 
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8f208b979f..8960fad02b 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7326,7 +7326,7 @@ You do not have access to this destination. You may be allowed into the region b
    name="ScriptQuestionExperience"
    persist="false"
    type="notify">
-&apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, an object owned by &apos;[NAME]&apos;, requests your participation in the [GRID_WIDE]experience:
+&apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, an object owned by &apos;[NAME]&apos;, requests your participation in the [GRID_WIDE] experience:
 
 [EXPERIENCE]
 
diff --git a/indra/newview/skins/default/xui/en/panel_region_experiences.xml b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
index ea57bdd164..9d06ce6b0c 100644
--- a/indra/newview/skins/default/xui/en/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml
@@ -20,13 +20,13 @@ Additionally, if the estate does not allow public access, Residents participatin
    </panel.string>
    <panel.string
       name="allowed_estate_text">
-Only Experiences that are not Grid-Wide may be Allowed.
+Only Experiences that are Land-Scope may be Allowed.
 
 Allowed Experiences have permission to run on this estate.
    </panel.string>
    <panel.string
       name="blocked_estate_text">
-Only Grid-Wide Experiences may be Blocked.
+Only Grid-Scope Experiences may be Blocked.
       
 Blocked Experiences may not run on this estate.
    </panel.string>
@@ -35,12 +35,12 @@ Blocked Experiences may not run on this estate.
       Changes to settings on this tab will affect all regions in the estate.
    </panel.string>
    <panel.string
-      name="allowed_parcel_text">Only Experiences that are not Grid-Wide may be Allowed.
+      name="allowed_parcel_text">Only Experiences that are Land-Scope may be Allowed.
       
 Allowed Experiences have permission to run on this parcel if they are not Blocked by the estate.
    </panel.string>
    <panel.string
-      name="blocked_parcel_text">Only Grid-Wide Experiences may be Blocked.
+      name="blocked_parcel_text">Any Resident Experience may be Blocked.
       
 Blocked Experiences may not run on this parcel.
    </panel.string>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index fbf696933b..65c95e9486 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4031,7 +4031,8 @@ Try enclosing path to the editor with double quotes.
   <string name="experience_tools_experience">Experience</string>
   <string name="ExperienceNameNull">(no experience)</string>
   <string name="ExperienceNameUntitled">(untitled experience)</string>
-  <string name="GRID_WIDE">Grid-wide</string>
+  <string name="Land-Scope">Land-Scope</string>
+  <string name="Grid-Scope">Grid-Scope</string>
   <string name="Allowed_Experiences_Tab">ALLOWED</string>
   <string name="Blocked_Experiences_Tab">BLOCKED</string>
   <string name="Contrib_Experiences_Tab">CONTRIBUTOR</string>
-- 
cgit v1.2.3