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.

---
 indra/newview/skins/minimal/xui/en/widgets/location_input.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/newview/skins/minimal')

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

---
 indra/newview/skins/minimal/xui/en/widgets/location_input.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/minimal')

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

---
 indra/newview/skins/minimal/xui/en/widgets/location_input.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/minimal')

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

---
 indra/newview/skins/minimal/xui/en/widgets/location_input.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/minimal')

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