From 9bfae21706288802f94d642eb252ac78b4d9e85c Mon Sep 17 00:00:00 2001
From: Dave SIMmONs <simon@lindenlab.com>
Date: Mon, 2 May 2011 16:35:55 -0700
Subject: ER-858: Add viewer checkbox to toggle parcel privacy settings. 
 Reviewed by Kelly

---
 .../newview/skins/default/xui/en/floater_about_land.xml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

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 6e985e0476..d2567e8197 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1204,6 +1204,10 @@ Only large parcels can be listed in search.
              name="push_restrict_region_text">
                 No Pushing (Region Override)
             </panel.string>
+            <panel.string
+             name="private_parcel_text">
+                Private Parcel
+            </panel.string>
             <text
              type="string"
              length="1"
@@ -1333,7 +1337,7 @@ Only large parcels can be listed in search.
              name="check safe"
              tool_tip="If checked, sets the land to Safe, disabling damage combat. If cleared, damage combat is enabled."
              top_pad="5"
-             width="200" />
+             width="280" />
             <check_box
              height="16"
              label="No Pushing"
@@ -1350,7 +1354,16 @@ Only large parcels can be listed in search.
              left="14"
              name="ShowDirectoryCheck"
              tool_tip="Let people see this parcel in search results"
-             width="430" />
+             width="280" />
+            <check_box
+             height="16"
+             label="Private Parcel"
+             layout="topleft"
+             left_pad="5"
+             name="PrivateParcelCheck"
+             tool_tip="Prevents avatars from seeing into or out of the parcel."
+             top_delta="0"
+             width="119" />
             <combo_box
              enabled="false"
              height="23"
-- 
cgit v1.2.3


From b43da6721e538290962cafa7ddd32a8f4c7e21db Mon Sep 17 00:00:00 2001
From: Dave SIMmONs <simon@lindenlab.com>
Date: Fri, 6 May 2011 18:29:43 -0700
Subject: Viewer UI work to add icons for the nav bar and places profile to
 indicate parcel privacy settings.  Using engineering art icons.

---
 .../textures/icons/Parcel_PrivacyOff_Dark.png      | Bin 0 -> 787 bytes
 .../textures/icons/Parcel_PrivacyOn_Dark.png       | Bin 0 -> 833 bytes
 indra/newview/skins/default/textures/textures.xml  |   4 ++-
 .../newview/skins/default/xui/en/notifications.xml |  11 +++++++
 .../skins/default/xui/en/panel_place_profile.xml   |  33 +++++++++++++++++++++
 .../skins/default/xui/en/panel_topinfo_bar.xml     |  10 +++++++
 indra/newview/skins/default/xui/en/strings.xml     |   1 +
 .../default/xui/en/widgets/location_input.xml      |   9 ++++++
 .../minimal/xui/en/widgets/location_input.xml      |   9 ++++++
 9 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png
new file mode 100644
index 0000000000..5f9fba4447
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png
new file mode 100644
index 0000000000..ad93163a85
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 1ca48b01a8..93dab65bcd 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -1,4 +1,4 @@
-<!--
+<!--
 This file contains metadata about how to load, display, and scale textures for rendering in the UI.
 Images do *NOT* have to appear in this file in order to use them as textures in the UI...simply refer
 to them by filename (relative to textures directory).
@@ -348,6 +348,8 @@ with the same filename but different name
  <texture name="Parcel_ScriptsNo_Dark" file_name="icons/Parcel_ScriptsNo_Dark.png" preload="false" />
  <texture name="Parcel_Voice_Dark" file_name="icons/Parcel_Voice_Dark.png" preload="false" />
  <texture name="Parcel_VoiceNo_Dark" file_name="icons/Parcel_VoiceNo_Dark.png" preload="false" />
+ <texture name="Parcel_PrivacyOff_Dark" file_name="icons/Parcel_PrivacyOff_Dark.png" preload="false" />
+ <texture name="Parcel_PrivacyOn_Dark" file_name="icons/Parcel_PrivacyOn_Dark.png" preload="false" />
 
  <texture name="Parcel_BuildNo_Light" file_name="icons/Parcel_BuildNo_Light.png" preload="false" />
  <texture name="Parcel_FlyNo_Light" file_name="icons/Parcel_FlyNo_Light.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3fb3717e68..c865347304 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5627,6 +5627,17 @@ This area has voice chat disabled. You won&apos;t be able to hear anyone talking
 This area has building disabled. You can&apos;t build or rez objects here.
   </notification>
 
+  <notification
+   icon="privacy.tga"
+   name="PrivateParcel"
+   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.
+  </notification>
+
   <notification
    icon="notify.tga"
    name="ScriptsStopped"
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 7e89860c60..66be6701fb 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -153,6 +153,14 @@
      name="icon_DamageNo"
      translate="false"
      value="Parcel_DamageNo_Dark" />
+    <string
+     name="icon_PrivacyOff"
+     translate="false"
+     value="Parcel_PrivacyOff_Dark" />
+    <string
+     name="icon_PrivacyOn"
+     translate="false"
+     value="Parcel_PrivacyOn_Dark" />
     <button
      follows="top|left"
      height="24"
@@ -543,6 +551,31 @@
                          top_delta="0"
                          value="Off"
                          width="60" />
+                        <icon
+                         follows="top|left"
+                         height="18"
+                         image_name="Parcel_PrivacyOff_Dark"
+                         layout="topleft"
+                         left="10"
+                         name="privacy_icon"
+                         top_pad="7"
+                         width="22" />
+                        <text
+                         follows="left|top"
+                         height="14"
+                         layout="topleft"
+                         left_pad="8"
+                         name="privacy_label"
+                         value="Privacy:"
+                         width="90" />
+                        <text
+                         follows="left|top"
+                         height="14"
+                         layout="topleft"
+                         left_pad="0"
+                         name="privacy_value"
+                         value="Off"
+                         width="60" />
                         <button
                          follows="bottom|right"
                          height="23"
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 30d3064e14..98cb17bbce 100644
--- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
@@ -88,6 +88,16 @@
     visible="false"
     width="14"
     />
+  <icon
+    follows="right|top"
+    height="13"
+    image_name="Parcel_PrivacyOff_Dark"
+    left="2"
+    name="privacy_icon"
+    top="3"
+    visible="false"
+    width="14"
+    />
   <text
     follows="right|top"
     font="SansSerifSmall"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b0ede60fa0..6658d6f683 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3043,6 +3043,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>
 
   <!-- 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 37d60f1671..c818cdfaeb 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -123,6 +123,15 @@
 	font="SansSerifSmall"
 	text_color="TextFgColor"
 	/>
+  <privacy_icon
+    name="privacy_icon"
+    width="14"
+    height="13"
+    top="19"
+    left="2"
+    follows="right|top"
+    image_name="Parcel_PrivacyOn_Dark"
+    />
   <combo_button
 		name="Location History"
                 label=""
diff --git a/indra/newview/skins/minimal/xui/en/widgets/location_input.xml b/indra/newview/skins/minimal/xui/en/widgets/location_input.xml
index fe06a2d816..1292b43605 100644
--- a/indra/newview/skins/minimal/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/minimal/xui/en/widgets/location_input.xml
@@ -113,6 +113,15 @@
 	  font="SansSerifSmall"
 	  text_color="TextFgColor"
 	/>
+  <privacy_icon
+    name="privacy_icon"
+    width="14"
+    height="13"
+    top="19"
+    left="2"
+    follows="right|top"
+    image_name="Parcel_PrivacyOn_Dark"
+    />
   <combo_button
 		name="Location History"
                 label=""
-- 
cgit v1.2.3


From b55d678f8da105aa02d913abcbf66fc9bd167363 Mon Sep 17 00:00:00 2001
From: Dave SIMmONs <simon@lindenlab.com>
Date: Mon, 9 May 2011 11:00:54 -0700
Subject: Clean up parcel privacy icons and locations

---
 .../default/textures/icons/Parcel_PrivacyOff_Dark.png   | Bin 787 -> 730 bytes
 .../default/textures/icons/Parcel_PrivacyOn_Dark.png    | Bin 833 -> 814 bytes
 .../skins/default/xui/en/widgets/location_input.xml     |   7 +++----
 .../skins/minimal/xui/en/widgets/location_input.xml     |   9 ++++-----
 4 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png
index 5f9fba4447..8b3376e514 100644
Binary files a/indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png and b/indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png
index ad93163a85..4e474d7f5a 100644
Binary files a/indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png and b/indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png differ
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 c818cdfaeb..5a60576b4a 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -125,10 +125,9 @@
 	/>
   <privacy_icon
     name="privacy_icon"
-    width="14"
-    height="13"
-    top="19"
-    left="2"
+    width="22"
+    height="18"
+    top="21"
     follows="right|top"
     image_name="Parcel_PrivacyOn_Dark"
     />
diff --git a/indra/newview/skins/minimal/xui/en/widgets/location_input.xml b/indra/newview/skins/minimal/xui/en/widgets/location_input.xml
index 1292b43605..531e378425 100644
--- a/indra/newview/skins/minimal/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/minimal/xui/en/widgets/location_input.xml
@@ -115,12 +115,11 @@
 	/>
   <privacy_icon
     name="privacy_icon"
-    width="14"
-    height="13"
-    top="19"
-    left="2"
+    width="0"
+    height="0"
+    visible="false" 
+    top="21"
     follows="right|top"
-    image_name="Parcel_PrivacyOn_Dark"
     />
   <combo_button
 		name="Location History"
-- 
cgit v1.2.3


From ff3289e2f3a8e87ce33cb267ad30b4a431406f9e Mon Sep 17 00:00:00 2001
From: Dave SIMmONs <simon@lindenlab.com>
Date: Fri, 13 May 2011 13:56:49 -0700
Subject: ER-898: Modify llGetParcelDetails() on viewer to support parcel
 privacy.  Reviewed by Kelly.

---
 indra/newview/skins/default/xui/en/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 6658d6f683..92a2296740 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1683,7 +1683,7 @@ Returns the maximum number of prims allowed on the parcel at pos
 	<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
+Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _PRIVACY
 	</string>
 	<string name="LSLTipText_llSetLinkPrimitiveParams" translate="false">
 llSetLinkPrimitiveParams(integer linknumber, list rules)
-- 
cgit v1.2.3


From 50393788693578a2fe3a934faa04b382d75f1657 Mon Sep 17 00:00:00 2001
From: Dave SIMmONs <simon@lindenlab.com>
Date: Thu, 9 Jun 2011 13:46:19 -0700
Subject: ER-910: Parcel Privacy.  Rename things in code to reflect feature
 name change to "hidden avatars"

---
 .../textures/icons/Parcel_HiddenAVsOff_Dark.png     | Bin 0 -> 730 bytes
 .../textures/icons/Parcel_HiddenAVsOn_Dark.png      | Bin 0 -> 814 bytes
 .../textures/icons/Parcel_PrivacyOff_Dark.png       | Bin 730 -> 0 bytes
 .../textures/icons/Parcel_PrivacyOn_Dark.png        | Bin 814 -> 0 bytes
 indra/newview/skins/default/textures/textures.xml   |   4 ++--
 .../skins/default/xui/en/floater_about_land.xml     |   4 ++--
 .../newview/skins/default/xui/en/notifications.xml  |   8 +++-----
 .../skins/default/xui/en/panel_place_profile.xml    |  20 ++++++++++----------
 .../skins/default/xui/en/panel_topinfo_bar.xml      |   4 ++--
 indra/newview/skins/default/xui/en/strings.xml      |  10 +++++-----
 .../skins/default/xui/en/widgets/location_input.xml |   6 +++---
 .../skins/minimal/xui/en/widgets/location_input.xml |   4 ++--
 12 files changed, 29 insertions(+), 31 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png
 delete mode 100644 indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png
 delete mode 100644 indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png
new file mode 100644
index 0000000000..8b3376e514
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png
new file mode 100644
index 0000000000..4e474d7f5a
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png
deleted file mode 100644
index 8b3376e514..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Parcel_PrivacyOff_Dark.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png
deleted file mode 100644
index 4e474d7f5a..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Parcel_PrivacyOn_Dark.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index cb20cf3740..e8fe3cd82f 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -369,8 +369,8 @@ with the same filename but different name
  <texture name="Parcel_ScriptsNo_Dark" file_name="icons/Parcel_ScriptsNo_Dark.png" preload="false" />
  <texture name="Parcel_Voice_Dark" file_name="icons/Parcel_Voice_Dark.png" preload="false" />
  <texture name="Parcel_VoiceNo_Dark" file_name="icons/Parcel_VoiceNo_Dark.png" preload="false" />
- <texture name="Parcel_PrivacyOff_Dark" file_name="icons/Parcel_PrivacyOff_Dark.png" preload="false" />
- <texture name="Parcel_PrivacyOn_Dark" file_name="icons/Parcel_PrivacyOn_Dark.png" preload="false" />
+ <texture name="Parcel_HiddenAVsOff_Dark" file_name="icons/Parcel_HiddenAVsOff_Dark.png" preload="false" />
+ <texture name="Parcel_HiddenAVsOn_Dark" file_name="icons/Parcel_HiddenAVsOn_Dark.png" preload="false" />
 
  <texture name="Parcel_BuildNo_Light" file_name="icons/Parcel_BuildNo_Light.png" preload="false" />
  <texture name="Parcel_FlyNo_Light" file_name="icons/Parcel_FlyNo_Light.png" preload="false" />
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"
diff --git a/indra/newview/skins/minimal/xui/en/widgets/location_input.xml b/indra/newview/skins/minimal/xui/en/widgets/location_input.xml
index 531e378425..9c2ba221ba 100644
--- a/indra/newview/skins/minimal/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/minimal/xui/en/widgets/location_input.xml
@@ -113,8 +113,8 @@
 	  font="SansSerifSmall"
 	  text_color="TextFgColor"
 	/>
-  <privacy_icon
-    name="privacy_icon"
+  <hidden_av_icon
+    name="hidden_av_icon"
     width="0"
     height="0"
     visible="false" 
-- 
cgit v1.2.3


From c0c0a2b9a5f41fc06619330a81c34955a39ddfe2 Mon Sep 17 00:00:00 2001
From: "simon@lindenlab.com" <simon@lindenlab.com>
Date: Mon, 20 Jun 2011 09:28:10 -0700
Subject: ER-944:  Add feature to control user sounds on a parcel.  Added new
 checkboxes to the About Land / Sound tab.  Reviewed by Kelly.

---
 .../skins/default/xui/en/floater_about_land.xml    | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'indra/newview/skins')

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 4ad42ea5bf..612d2a3bfe 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1858,6 +1858,34 @@ Only large parcels can be listed in search.
              name="check sound local"
              left_pad="0"
              width="292" />
+          <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="16"
+             layout="topleft"
+             left="10"
+             name="Avatar Sounds:"
+             top_pad="10"
+             width="100">
+               Avatar Sounds:
+          </text>
+          <check_box
+             height="16"
+             label="Everyone"
+             layout="topleft"
+             left_pad="0"
+             name="all av sound check"
+             top_delta="0"
+             width="130" />
+          <check_box
+             height="16"
+             label="Group"
+             layout="topleft"
+             left_pad="0"
+             name="group av sound check"
+             top_delta="0"
+             width="70" />
             <text
              type="string"
              length="1"
-- 
cgit v1.2.3


From 398019ffb2a036813c6c89a677e9534faa178330 Mon Sep 17 00:00:00 2001
From: "simon@lindenlab.com" <simon@lindenlab.com>
Date: Mon, 27 Jun 2011 10:11:57 -0700
Subject: ER-910: Parcel privacy.  Got new icons, cleaned up xml linkage a bit.

---
 .../textures/icons/Parcel_HiddenAVsOff_Dark.png        | Bin 730 -> 3011 bytes
 .../default/textures/icons/Parcel_HiddenAVsOn_Dark.png | Bin 814 -> 3194 bytes
 .../textures/icons/Parcel_HiddenAVsOn_Light.png        | Bin 0 -> 3189 bytes
 indra/newview/skins/default/textures/textures.xml      |   1 +
 .../newview/skins/default/xui/en/panel_topinfo_bar.xml |   2 +-
 .../skins/default/xui/en/widgets/location_input.xml    |   2 +-
 6 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png
index 8b3376e514..064687ed0f 100644
Binary files a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png and b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png
index 4e474d7f5a..956e02b14d 100644
Binary files a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png and b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png
new file mode 100644
index 0000000000..434caeda8b
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index e8fe3cd82f..e63e25b308 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -371,6 +371,7 @@ with the same filename but different name
  <texture name="Parcel_VoiceNo_Dark" file_name="icons/Parcel_VoiceNo_Dark.png" preload="false" />
  <texture name="Parcel_HiddenAVsOff_Dark" file_name="icons/Parcel_HiddenAVsOff_Dark.png" preload="false" />
  <texture name="Parcel_HiddenAVsOn_Dark" file_name="icons/Parcel_HiddenAVsOn_Dark.png" preload="false" />
+ <texture name="Parcel_HiddenAVsOn_Light" file_name="icons/Parcel_HiddenAVsOn_Light.png" preload="false" />
 
  <texture name="Parcel_BuildNo_Light" file_name="icons/Parcel_BuildNo_Light.png" preload="false" />
  <texture name="Parcel_FlyNo_Light" file_name="icons/Parcel_FlyNo_Light.png" preload="false" />
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 f744e8d4cb..d9a0eb884c 100644
--- a/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_topinfo_bar.xml
@@ -91,7 +91,7 @@
   <icon
     follows="right|top"
     height="13"
-    image_name="Parcel_HiddenAVsOff_Dark"
+    image_name="Parcel_HiddenAVsOn_Light"
     left="2"
     name="hidden_av_icon"
     top="3"
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 adb8cf3172..6041d750da 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -129,7 +129,7 @@
     height="18"
     top="21"
     follows="right|top"
-    image_name="Parcel_HiddenAVsOn_Dark"
+    image_name="Parcel_HiddenAVsOn_Light"
     />
   <combo_button
 		name="Location History"
-- 
cgit v1.2.3


From 918238dd18f74ee2783d55dfb961e8f44b2f4b1b Mon Sep 17 00:00:00 2001
From: "simon@lindenlab.com" <simon@lindenlab.com>
Date: Fri, 1 Jul 2011 14:06:08 -0700
Subject: ER-1016 - "Remove ability for anyone to edit terrain" and ER-910
 "Parcel Privacy" changes.  Many naming changes for the featureto be "See
 avatars" instead of "hidden avatars".  Also removed the "anyone can edit
 terrain" checkbox and slammed the value to FALSE.

---
 .../textures/icons/Parcel_HiddenAVsOff_Dark.png    | Bin 3011 -> 0 bytes
 .../textures/icons/Parcel_HiddenAVsOn_Dark.png     | Bin 3194 -> 0 bytes
 .../textures/icons/Parcel_HiddenAVsOn_Light.png    | Bin 3189 -> 0 bytes
 .../textures/icons/Parcel_SeeAVsOff_Dark.png       | Bin 0 -> 3194 bytes
 .../textures/icons/Parcel_SeeAVsOff_Light.png      | Bin 0 -> 3189 bytes
 .../textures/icons/Parcel_SeeAVsOn_Dark.png        | Bin 0 -> 3011 bytes
 .../textures/icons/Parcel_SeeAVsOn_Light.png       | Bin 0 -> 3011 bytes
 indra/newview/skins/default/textures/textures.xml  |   7 ++--
 .../skins/default/xui/en/floater_about_land.xml    |  37 ++++++++-------------
 .../newview/skins/default/xui/en/notifications.xml |   4 +--
 .../skins/default/xui/en/panel_place_profile.xml   |  18 +++++-----
 .../skins/default/xui/en/panel_topinfo_bar.xml     |   4 +--
 indra/newview/skins/default/xui/en/strings.xml     |   4 +--
 .../default/xui/en/widgets/location_input.xml      |   6 ++--
 .../minimal/xui/en/widgets/location_input.xml      |   4 +--
 15 files changed, 38 insertions(+), 46 deletions(-)
 delete mode 100644 indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png
 delete mode 100644 indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png
 delete mode 100644 indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png
 create mode 100644 indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png
deleted file mode 100644
index 064687ed0f..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOff_Dark.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png
deleted file mode 100644
index 956e02b14d..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Dark.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png b/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png
deleted file mode 100644
index 434caeda8b..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Parcel_HiddenAVsOn_Light.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png
new file mode 100644
index 0000000000..956e02b14d
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png
new file mode 100644
index 0000000000..434caeda8b
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOff_Light.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png
new file mode 100644
index 0000000000..064687ed0f
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Dark.png differ
diff --git a/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png
new file mode 100644
index 0000000000..5465650d0c
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Parcel_SeeAVsOn_Light.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index e63e25b308..dad6dfd4cf 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -369,9 +369,10 @@ with the same filename but different name
  <texture name="Parcel_ScriptsNo_Dark" file_name="icons/Parcel_ScriptsNo_Dark.png" preload="false" />
  <texture name="Parcel_Voice_Dark" file_name="icons/Parcel_Voice_Dark.png" preload="false" />
  <texture name="Parcel_VoiceNo_Dark" file_name="icons/Parcel_VoiceNo_Dark.png" preload="false" />
- <texture name="Parcel_HiddenAVsOff_Dark" file_name="icons/Parcel_HiddenAVsOff_Dark.png" preload="false" />
- <texture name="Parcel_HiddenAVsOn_Dark" file_name="icons/Parcel_HiddenAVsOn_Dark.png" preload="false" />
- <texture name="Parcel_HiddenAVsOn_Light" file_name="icons/Parcel_HiddenAVsOn_Light.png" preload="false" />
+ <texture name="Parcel_SeeAVsOff_Dark" file_name="icons/Parcel_SeeAVsOff_Dark.png" preload="false" />
+ <texture name="Parcel_SeeAVsOn_Dark" file_name="icons/Parcel_SeeAVsOn_Dark.png" preload="false" />
+ <texture name="Parcel_SeeAVsOff_Light" file_name="icons/Parcel_SeeAVsOff_Light.png" preload="false" />
+ <texture name="Parcel_SeeAVsOn_Light" file_name="icons/Parcel_SeeAVsOn_Light.png" preload="false" />
 
  <texture name="Parcel_BuildNo_Light" file_name="icons/Parcel_BuildNo_Light.png" preload="false" />
  <texture name="Parcel_FlyNo_Light" file_name="icons/Parcel_FlyNo_Light.png" preload="false" />
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 612d2a3bfe..ac186d7737 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="hidden_avs_text">
-                Hidden Avatars
+             name="see_avs_text">
+                See and chat with avatars on this parcel
             </panel.string>
             <text
              type="string"
@@ -1218,18 +1218,9 @@ Only large parcels can be listed in search.
              left="10"
              name="allow_label"
              top="10"
-             width="278">
+             width="270">
                 Allow other Residents to:
             </text>
-            <check_box
-             height="16"
-             label="Edit Terrain"
-             layout="topleft"
-             left="14"
-             name="edit land check"
-             tool_tip="If checked, anyone can terraform your land. It is best to leave this unchecked, as you can always edit your own land."
-             top_pad="4"
-             width="147i" />
             <check_box
              height="16"
              label="Fly"
@@ -1237,7 +1228,7 @@ Only large parcels can be listed in search.
              name="check fly"
              tool_tip="If checked, Residents can fly on your land. If unchecked, they can only fly into and over your land."
              left_pad="4"
-             width="150" />
+             width="128" />
             <text
              type="string"
              length="1"
@@ -1317,7 +1308,16 @@ Only large parcels can be listed in search.
              name="check group scripts"
              top_delta="0"
              width="70" />
-            <text
+          <check_box
+             height="16"
+             label="See Avatars"
+             layout="topleft"
+             left="14"
+             name="SeeAvatarsCheck"
+             tool_tip="Allow avatars on other parcels to see and chat with avatars on this parcel."
+             top_pad="5"
+             width="119" />
+           <text
              type="string"
              text_color="white"
              length="1"
@@ -1355,15 +1355,6 @@ Only large parcels can be listed in search.
              name="ShowDirectoryCheck"
              tool_tip="Let people see this parcel in search results"
              width="280" />
-            <check_box
-             height="16"
-             label="Private Parcel"
-             layout="topleft"
-             left_pad="5"
-             name="PrivateParcelCheck"
-             tool_tip="Prevents avatars from seeing into or out of the parcel."
-             top_delta="0"
-             width="119" />
             <combo_box
              enabled="false"
              height="23"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a6f1b5bf5c..503f8dfe64 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5655,11 +5655,11 @@ This area has building disabled. You can&apos;t build or rez objects here.
 
   <notification
    icon="notify.tga"
-   name="HiddenAVs"
+   name="SeeAvatars"
    persist="true"
    type="notify"
    unique="true">
-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.
+This parcel hides avatars and text chat from another parcel.   You can&apos;t see other residents outside the parcel, and those outside are not able to see you.  Regular text chat on channel 0 is also blocked.
   </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 9c6ee32d45..e280115bda 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_HiddenAVsOff"
+     name="icon_SeeAVs_Off"
      translate="false"
-     value="Parcel_HiddenAVsOff_Dark" />
+     value="Parcel_SeeAVsOff_Dark" />
     <string
-     name="icon_HiddenAVsOn"
+     name="icon_SeeAVs_On"
      translate="false"
-     value="Parcel_HiddenAVsOn_Dark" />
+     value="Parcel_SeeAVsOn_Dark" />
     <button
      follows="top|left"
      height="24"
@@ -554,10 +554,10 @@
                         <icon
                          follows="top|left"
                          height="18"
-                         image_name="Parcel_HiddenAVsOff_Dark"
+                         image_name="Parcel_SeeAVsOff_Dark"
                          layout="topleft"
                          left="10"
-                         name="hidden_av_icon"
+                         name="see_avatars_icon"
                          top_pad="7"
                          width="22" />
                         <text
@@ -565,15 +565,15 @@
                          height="14"
                          layout="topleft"
                          left_pad="8"
-                         name="hidden_avs_label"
-                         value="Hidden Avatars:"
+                         name="see_avatars_label"
+                         value="See Avatars:"
                          width="90" />
                         <text
                          follows="left|top"
                          height="14"
                          layout="topleft"
                          left_pad="0"
-                         name="hidden_av_value"
+                         name="see_avatars_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 d9a0eb884c..79f29777ce 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_HiddenAVsOn_Light"
+    image_name="Parcel_SeeAVsOff_Light"
     left="2"
-    name="hidden_av_icon"
+    name="see_avatars_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 416e1ac620..db6cd559b8 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1761,7 +1761,7 @@ Returns the maximum number of prims allowed on the parcel at pos
 	<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, _HIDDEN_AVS
+    Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _SEE_AVATARS
   </string>
 	<string name="LSLTipText_llSetLinkPrimitiveParams" translate="false">
 llSetLinkPrimitiveParams(integer linknumber, list rules)
@@ -3133,7 +3133,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="LocationCtrlHiddenAVsTooltip">Hidden Avatars Parcel</string>
+  <string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this 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 6041d750da..44436fb6f2 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"
 	/>
-  <hidden_av_icon
-    name="hidden_av_icon"
+  <see_avatars_icon
+    name="see_avatars_icon"
     width="22"
     height="18"
     top="21"
     follows="right|top"
-    image_name="Parcel_HiddenAVsOn_Light"
+    image_name="Parcel_SeeAVsOff_Light"
     />
   <combo_button
 		name="Location History"
diff --git a/indra/newview/skins/minimal/xui/en/widgets/location_input.xml b/indra/newview/skins/minimal/xui/en/widgets/location_input.xml
index 9c2ba221ba..ba148cf421 100644
--- a/indra/newview/skins/minimal/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/minimal/xui/en/widgets/location_input.xml
@@ -113,8 +113,8 @@
 	  font="SansSerifSmall"
 	  text_color="TextFgColor"
 	/>
-  <hidden_av_icon
-    name="hidden_av_icon"
+  <see_avatars_icon
+    name="see_avatars_icon"
     width="0"
     height="0"
     visible="false" 
-- 
cgit v1.2.3


From f5bd2109c27b098dd73a9578f1f032b6ff9e4c2d Mon Sep 17 00:00:00 2001
From: "simon@lindenlab.com" <simon@lindenlab.com>
Date: Thu, 7 Jul 2011 17:42:54 -0700
Subject: Revert code fo ER-1016 - "Remove ability for anyone to edit terrain"
 and muck with the "About Land" Options tab one more time.

---
 .../skins/default/xui/en/floater_about_land.xml    | 47 +++++++++++++---------
 1 file changed, 28 insertions(+), 19 deletions(-)

(limited to 'indra/newview/skins')

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 ac186d7737..df6a9d82e2 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1206,7 +1206,8 @@ Only large parcels can be listed in search.
             </panel.string>
             <panel.string
              name="see_avs_text">
-                See and chat with avatars on this parcel
+                 Allow avatars on other parcels to see
+ and chat with avatars on this parcel
             </panel.string>
             <text
              type="string"
@@ -1218,9 +1219,18 @@ Only large parcels can be listed in search.
              left="10"
              name="allow_label"
              top="10"
-             width="270">
+             width="278">
                 Allow other Residents to:
             </text>
+            <check_box
+             height="16"
+             label="Edit Terrain"
+             layout="topleft"
+             left="14"
+             name="edit land check"
+             tool_tip="If checked, anyone can terraform your land. It is best to leave this unchecked, as you can always edit your own land."
+             top_pad="4"
+             width="147i" />
             <check_box
              height="16"
              label="Fly"
@@ -1228,7 +1238,7 @@ Only large parcels can be listed in search.
              name="check fly"
              tool_tip="If checked, Residents can fly on your land. If unchecked, they can only fly into and over your land."
              left_pad="4"
-             width="128" />
+             width="150" />
             <text
              type="string"
              length="1"
@@ -1308,15 +1318,6 @@ Only large parcels can be listed in search.
              name="check group scripts"
              top_delta="0"
              width="70" />
-          <check_box
-             height="16"
-             label="See Avatars"
-             layout="topleft"
-             left="14"
-             name="SeeAvatarsCheck"
-             tool_tip="Allow avatars on other parcels to see and chat with avatars on this parcel."
-             top_pad="5"
-             width="119" />
            <text
              type="string"
              text_color="white"
@@ -1337,7 +1338,7 @@ Only large parcels can be listed in search.
              name="check safe"
              tool_tip="If checked, sets the land to Safe, disabling damage combat. If cleared, damage combat is enabled."
              top_pad="5"
-             width="280" />
+             width="200" />
             <check_box
              height="16"
              label="No Pushing"
@@ -1354,7 +1355,7 @@ Only large parcels can be listed in search.
              left="14"
              name="ShowDirectoryCheck"
              tool_tip="Let people see this parcel in search results"
-             width="280" />
+             width="430" />
             <combo_box
              enabled="false"
              height="23"
@@ -1514,14 +1515,23 @@ Only large parcels can be listed in search.
              fallback_image="default_land_picture.j2c" 
              tool_tip="Click to choose a picture"
              width="195" />
+            <check_box
+             height="32"
+             label="See Avatars"
+             layout="topleft"
+             left="230"
+             top="164"
+             name="SeeAvatarsCheck"
+             tool_tip="Allows avatars on other parcels to see and chat with avatars on this parcel, and you to see and chat with them."
+             width="120" />
             <text
              type="string"
              length="1"
              follows="left|top"
              height="16"
              layout="topleft"
-             left="220"
-             top="180"
+             left="230"
+             top="230"
              text_color="white"
              name="landing_point"
              word_wrap="true"
@@ -1535,7 +1545,7 @@ Only large parcels can be listed in search.
              label_selected="Set"
              layout="topleft"
              name="Set"
-             right="-68"
+             left="230"
              tool_tip="Sets the landing point where visitors arrive. Sets to your avatar&apos;s location inside this parcel."
              width="50" />
             <button
@@ -1547,7 +1557,6 @@ Only large parcels can be listed in search.
              left_pad="5"
              name="Clear"
              tool_tip="Clear the landing point"
-             right="-10"
              width="55" />
             <text
              type="string"
@@ -1556,7 +1565,7 @@ Only large parcels can be listed in search.
              follows="left|top"
              height="16"
              layout="topleft"
-             left="220"
+             left="230"
              top_pad="10"
              name="Teleport Routing: "
              width="200">
-- 
cgit v1.2.3


From bef014ad2ab9496755ef266cdfaeb9f9c333b240 Mon Sep 17 00:00:00 2001
From: "simon@lindenlab.com" <simon@lindenlab.com>
Date: Fri, 8 Jul 2011 15:41:55 -0700
Subject: ER-910 cleanup:  removed a stale comment, tweaked text in About Land
 dialog Options tab.

---
 .../skins/default/xui/en/floater_about_land.xml    | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins')

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 5067ef7167..07cb4c12f5 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -1207,8 +1207,7 @@ Only large parcels can be listed in search.
             </panel.string>
             <panel.string
              name="see_avs_text">
-                 Allow avatars on other parcels to see
- and chat with avatars on this parcel
+                 See and chat with residents on this parcel
             </panel.string>
             <text
              type="string"
@@ -1516,14 +1515,27 @@ Only large parcels can be listed in search.
              fallback_image="default_land_picture.j2c" 
              tool_tip="Click to choose a picture"
              width="195" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             text_color="white"
+             height="16"
+             layout="topleft"
+             left="230"
+             top="174"
+             name="allow_label5"
+             width="278">
+              Allow Residents on other parcels to:
+            </text>
             <check_box
-             height="32"
+             height="16"
              label="See Avatars"
+             follows="top"
              layout="topleft"
              left="230"
-             top="164"
              name="SeeAvatarsCheck"
-             tool_tip="Allows avatars on other parcels to see and chat with avatars on this parcel, and you to see and chat with them."
+             tool_tip="Allows residents on other parcels to see and chat with residents on this parcel, and you to see and chat with them."
              width="120" />
             <text
              type="string"
-- 
cgit v1.2.3