livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACME-1601: Updated message to match behavior 

ACME-1616: Change references of "Grid-Wide" to "Grid-Scope" and "non Grid-Wide"
 to "Land-Scope"
master
dolphin 2014-10-28 11:43:45 -07:00
parent 0784ee7604
commit 8cc8e7dc77
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llfloaterexperienceprofile.cpp
View File

@ -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())
{

4
indra/newview/llviewermessage.cpp
View File

@ -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();

2
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -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]

8
indra/newview/skins/default/xui/en/panel_region_experiences.xml
View File

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

3
indra/newview/skins/default/xui/en/strings.xml
View File

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