Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-3

3 files changed, 14 insertions, 13 deletions

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
@@ -7022,27 +7022,28 @@ Hiding the Speak button will disable the voice feature.
   </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"
   type="hint"
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"
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"