From d582f40315b7fa78added723d8a96ffd84514fdc Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 7 Apr 2011 11:06:03 -0700
Subject: SOCIAL-717 FIX Artwork for click to move hint updated hint text to
 use numbers from image

---
 .../newview/skins/default/xui/en/notifications.xml | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8f5a95a504..318bc9251f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7021,27 +7021,28 @@ Hiding the Speak button will disable the voice feature.
     To walk or run, open the Move Panel and use the directional arrows to navigate. You can also use the directional keys on your keyboard.
   </notification>
 
-  <notification
-  name="HintDisplayName"
-  label="Display Name"
-  type="hint"
-  unique="true">
-    Set your customizable display name here. This is in addition to your unique username, which can't be changed. You can change how you see other people's names in your preferences.
-  </notification>
-
   <notification
   name="HintMoveClick"
-  label="Move"
+  label=""
   type="hint"
   unique="true">
-Click to Walk
+1. Click to Walk
 Click anywhere on the ground to walk to that spot.
 
-Click and Drag to Rotate View
+2. Click and Drag to Rotate View
 Click and drag anywhere on the world to rotate your view
     <tag>custom_skin</tag>
   </notification>
 
+  <notification
+  name="HintDisplayName"
+  label="Display Name"
+  type="hint"
+  unique="true">
+    Set your customizable display name here. This is in addition to your unique username, which can't be changed. You can change how you see other people's names in your preferences.
+  </notification>
+
+
   <notification
   name="HintView"
   label="View"
-- 
cgit v1.2.3


From 6fe4eaf4a059d49eb4132c68208a8e43b1830523 Mon Sep 17 00:00:00 2001
From: Leslie Linden <none@none>
Date: Thu, 7 Apr 2011 16:20:23 -0700
Subject: SOCIAL-872 FIX -- User can toggle Show Me in Search before logging in
 which updates local settings file but not the actual value in the database
 WEB-3750 Attempted FIX -- Gone Profile

* Check box for "show me in search" privacy setting no longer enabled until login.
* Avatar server update message only sent on status change.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index ef25588ca3..6954a8b53a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -42,7 +42,7 @@
     </text>
     <check_box
 	 height="16"
-     enabled="true"
+     enabled="false"
      label="Show me in Search results"
      layout="topleft"
      left="30"
-- 
cgit v1.2.3


From df370922aee21e853cbd641eab195f1b985816ce Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 7 Apr 2011 16:20:49 -0700
Subject: incorrect tooltip

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
index 0145de8be9..d0a77e8c2a 100644
--- a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml
@@ -163,7 +163,7 @@
 			layout="topleft"
 			left="0"
 			name="destination_btn"
-			tool_tip="Shows people window"
+			tool_tip="Shows destinations"
 			top="5"
 			is_toggle="true"
 			use_ellipses="true"
-- 
cgit v1.2.3