ER-910: Parcel Privacy. Rename things in code to reflect feature name change to "hidden avatars"

6 files changed, 25 insertions, 27 deletions

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 d2567e8197..4ad42ea5bf 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1205,8 +1205,8 @@ Only large parcels can be listed in search.
                 No Pushing (Region Override)
             </panel.string>
             <panel.string
-             name="private_parcel_text">
-                Private Parcel
+             name="hidden_avs_text">
+                Hidden Avatars
             </panel.string>
             <text
              type="string"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c86251bf28..9e3c3a9bac 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5654,14 +5654,12 @@ This area has building disabled. You can&apos;t build or rez objects here.
   </notification>
 
   <notification
-   icon="privacy.tga"
-   name="PrivateParcel"
+   icon="notify.tga"
+   name="HiddenAVs"
    persist="true"
    type="notify"
    unique="true">
-This is a private parcel.   You can&apos;t see 
-others outside the parcel, and those 
-outside are not able to see you.
+This parcel hides avatars from view from another parcel.   You can&apos;t see others outside the parcel, and those outside are not able to see you.
   </notification>
 
   <notification
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 26a7ebbb45..9c6ee32d45 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -154,13 +154,13 @@
      translate="false"
      value="Parcel_DamageNo_Dark" />
     <string
-     name="icon_PrivacyOff"
+     name="icon_HiddenAVsOff"
      translate="false"
-     value="Parcel_PrivacyOff_Dark" />
+     value="Parcel_HiddenAVsOff_Dark" />
     <string
-     name="icon_PrivacyOn"
+     name="icon_HiddenAVsOn"
      translate="false"
-     value="Parcel_PrivacyOn_Dark" />
+     value="Parcel_HiddenAVsOn_Dark" />
     <button
      follows="top|left"
      height="24"
@@ -362,7 +362,7 @@
                  title="Parcel">
                     <panel
                      follows="all"
-                     height="175"
+                     height="200"
                      layout="topleft"
                      left="0"
                      name="parcel_characteristics_panel"
@@ -554,10 +554,10 @@
                         <icon
                          follows="top|left"
                          height="18"
-                         image_name="Parcel_PrivacyOff_Dark"
+                         image_name="Parcel_HiddenAVsOff_Dark"
                          layout="topleft"
                          left="10"
-                         name="privacy_icon"
+                         name="hidden_av_icon"
                          top_pad="7"
                          width="22" />
                         <text
@@ -565,15 +565,15 @@
                          height="14"
                          layout="topleft"
                          left_pad="8"
-                         name="privacy_label"
-                         value="Privacy:"
+                         name="hidden_avs_label"
+                         value="Hidden Avatars:"
                          width="90" />
                         <text
                          follows="left|top"
                          height="14"
                          layout="topleft"
                          left_pad="0"
-                         name="privacy_value"
+                         name="hidden_av_value"
                          value="Off"
                          width="60" />
                         <button
diff --git a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
index 98cb17bbce..f744e8d4cb 100644
--- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
@@ -91,9 +91,9 @@
   <icon
     follows="right|top"
     height="13"
-    image_name="Parcel_PrivacyOff_Dark"
+    image_name="Parcel_HiddenAVsOff_Dark"
     left="2"
-    name="privacy_icon"
+    name="hidden_av_icon"
     top="3"
     visible="false"
     width="14"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 38cb547982..cc9fde4b81 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1759,10 +1759,10 @@ integer llGetParcelMaxPrims(vector pos, integer sim_wide)
 Returns the maximum number of prims allowed on the parcel at pos
 	</string>
 	<string name="LSLTipText_llGetParcelDetails" translate="false">
-list llGetParcelDetails(vector pos, list params)
-Returns the parcel details specified in params for the parcel at pos.
-Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _PRIVACY
-	</string>
+    list llGetParcelDetails(vector pos, list params)
+    Returns the parcel details specified in params for the parcel at pos.
+    Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _HIDDEN_AVS
+  </string>
 	<string name="LSLTipText_llSetLinkPrimitiveParams" translate="false">
 llSetLinkPrimitiveParams(integer linknumber, list rules)
 Sets primitive parameters for linknumber based on rules
@@ -3131,7 +3131,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="LocationCtrlAdultIconTooltip">Adult Region</string>
   <string name="LocationCtrlModerateIconTooltip">Moderate Region</string>
   <string name="LocationCtrlGeneralIconTooltip">General Region</string>
-  <string name="LocationCtrlPrivacyTooltip">Private Parcel</string>
+  <string name="LocationCtrlHiddenAVsTooltip">Hidden Avatars Parcel</string>
 
   <!-- Strings used by the (currently Linux) auto-updater app -->
 	<string name="UpdaterWindowTitle">
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 5a60576b4a..adb8cf3172 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -123,13 +123,13 @@
 	font="SansSerifSmall"
 	text_color="TextFgColor"
 	/>
-  <privacy_icon
-    name="privacy_icon"
+  <hidden_av_icon
+    name="hidden_av_icon"
     width="22"
     height="18"
     top="21"
     follows="right|top"
-    image_name="Parcel_PrivacyOn_Dark"
+    image_name="Parcel_HiddenAVsOn_Dark"
     />
   <combo_button
 		name="Location History"