diff options
Diffstat (limited to 'indra')
10 files changed, 31 insertions, 27 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e69adad190..d9607e5f6b 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -7967,7 +7967,7 @@ <key>ShowPGSearchAll</key> <map> <key>Comment</key> - <string>Display results of search All that are flagged as PG</string> + <string>Display results of search All that are flagged as general</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -7980,7 +7980,7 @@ <key>ShowMatureSearchAll</key> <map> <key>Comment</key> - <string>Display results of search All that are flagged as mature</string> + <string>Display results of search All that are flagged as moderate</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -8006,7 +8006,7 @@ <key>ShowPGGroups</key> <map> <key>Comment</key> - <string>Display results of find groups that are flagged as PG</string> + <string>Display results of find groups that are flagged as general</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -8019,7 +8019,7 @@ <key>ShowMatureGroups</key> <map> <key>Comment</key> - <string>Display results of find groups that are flagged as mature</string> + <string>Display results of find groups that are flagged as moderate</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -8045,7 +8045,7 @@ <key>ShowPGClassifieds</key> <map> <key>Comment</key> - <string>Display results of find classifieds that are flagged as PG</string> + <string>Display results of find classifieds that are flagged as general</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -8058,7 +8058,7 @@ <key>ShowMatureClassifieds</key> <map> <key>Comment</key> - <string>Display results of find classifieds that are flagged as mature</string> + <string>Display results of find classifieds that are flagged as moderate</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -8084,7 +8084,7 @@ <key>ShowPGEvents</key> <map> <key>Comment</key> - <string>Display results of find events that are flagged as PG</string> + <string>Display results of find events that are flagged as general</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -8097,7 +8097,7 @@ <key>ShowMatureEvents</key> <map> <key>Comment</key> - <string>Display results of find events that are flagged as mature</string> + <string>Display results of find events that are flagged as moderate</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -8123,7 +8123,7 @@ <key>ShowPGLand</key> <map> <key>Comment</key> - <string>Display results of find land sales that are flagged as PG</string> + <string>Display results of find land sales that are flagged as general</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -8136,7 +8136,7 @@ <key>ShowMatureLand</key> <map> <key>Comment</key> - <string>Display results of find land sales that are flagged as mature</string> + <string>Display results of find land sales that are flagged as moderate</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -8162,7 +8162,7 @@ <key>ShowPGSims</key> <map> <key>Comment</key> - <string>Display results of find places or find popular that are in PG sims</string> + <string>Display results of find places or find popular that are in general sims</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> @@ -8175,7 +8175,7 @@ <key>ShowMatureSims</key> <map> <key>Comment</key> - <string>Display results of find places or find popular that are in mature sims</string> + <string>Display results of find places or find popular that are in moderate sims</string> <key>Persist</key> <integer>1</integer> <key>HideFromEditor</key> diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp index 59985a61ff..3a8c3ab4d2 100644 --- a/indra/newview/llfloaterbuyland.cpp +++ b/indra/newview/llfloaterbuyland.cpp @@ -494,10 +494,14 @@ void LLFloaterBuyLandUI::updateCovenantInfo() LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion(); if(!region) return; + U8 sim_access = region->getSimAccess(); + std::string rating = LLViewerRegion::accessToString(sim_access); + LLTextBox* region_name = getChild<LLTextBox>("region_name_text"); if (region_name) { - region_name->setText(region->getName()); + std::string region_name_txt = region->getName() + " ("+rating +")"; + region_name->setText(region_name_txt); } LLTextBox* region_type = getChild<LLTextBox>("region_type_text"); diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 6706ef0c8b..05fc48f3a8 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -1181,7 +1181,7 @@ Only large parcels can be listed in search. </panel.string> <panel.string name="mature_check_adult"> - Explicit Content + Adult Content </panel.string> <panel.string name="mature_check_mature_tooltip"> @@ -1189,7 +1189,7 @@ Only large parcels can be listed in search. </panel.string> <panel.string name="mature_check_adult_tooltip"> - Your parcel information or content is considered explicit. + Your parcel information or content is considered adult. </panel.string> <panel.string name="landing_point_none"> @@ -1478,7 +1478,7 @@ Only large parcels can be listed in search. </combo_box> <check_box height="16" - label="Mature Content" + label="Moderate Content" layout="topleft" left="14" name="MatureCheck" diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml index 91ca3ef27a..f1a75bfcb4 100644 --- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml @@ -309,7 +309,7 @@ name="Indecency__Mature_content_in_PG_region" value="60" /> <combo_box.item - label="Indecency > Inappropriate content or conduct in a Mature region" + label="Indecency > Inappropriate content or conduct in a Moderate region" name="Indecency__Inappropriate_content_in_Mature_region" value="69" /> <combo_box.item diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index cb87c9a94d..ea417b4990 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -235,7 +235,7 @@ control_name="MapShowEvents" follows="top|right" height="16" - label="PG" + label="General" layout="topleft" left_pad="4" name="event_chk" diff --git a/indra/newview/skins/default/xui/en/panel_classified.xml b/indra/newview/skins/default/xui/en/panel_classified.xml index 18d12aef70..9622313786 100644 --- a/indra/newview/skins/default/xui/en/panel_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_classified.xml @@ -111,11 +111,11 @@ name="select_mature" value="Select" /> <combo_box.item - label="Mature Content" + label="Moderate Content" name="mature" value="Mature" /> <combo_box.item - label="PG Content" + label="General Content" name="pg" value="PG" /> </combo_box> diff --git a/indra/newview/skins/default/xui/en/panel_classified_info.xml b/indra/newview/skins/default/xui/en/panel_classified_info.xml index df889e87c3..5c594d3f14 100644 --- a/indra/newview/skins/default/xui/en/panel_classified_info.xml +++ b/indra/newview/skins/default/xui/en/panel_classified_info.xml @@ -11,11 +11,11 @@ width="333"> <panel.string name="type_mature"> - Mature + Moderate </panel.string> <panel.string name="type_pg"> - PG Content + General Content </panel.string> <button follows="top|right" diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index 9ab5c6b4f7..3f5da66dce 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -602,7 +602,7 @@ layout="topleft" left_pad="10" name="region_rating" - value="Explicit" + value="Adult" width="159" /> <text follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml index 1f22689313..79d8f3a0ee 100644 --- a/indra/newview/skins/default/xui/en/panel_region_general.xml +++ b/indra/newview/skins/default/xui/en/panel_region_general.xml @@ -171,7 +171,7 @@ </text> <combo_box height="20" - label="Mature" + label="Moderate" layout="topleft" left_delta="100" name="access_combo" diff --git a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml index bffd84877f..525c5aa8e7 100644 --- a/indra/newview/skins/default/xui/en/panel_region_general_layout.xml +++ b/indra/newview/skins/default/xui/en/panel_region_general_layout.xml @@ -171,7 +171,7 @@ </text> <combo_box height="20" - label="Mature" + label="Moderate" layout="topleft" left_delta="100" name="access_combo" @@ -182,11 +182,11 @@ name="Adult" value="42" /> <combo_box.item - label="Mature" + label="Moderate" name="Mature" value="21" /> <combo_box.item - label="PG" + label="General" name="PG" value="13" /> </combo_box> |