From 3f172058897c1d7dbee73a72ddd4f8890727f9ca Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 26 Jun 2012 12:27:08 -0700
Subject: Some clean-up after checking the differences between the pathfinding
 branch and viewer-release.

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 2 +-
 indra/newview/skins/default/xui/en/strings.xml       | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index c49ce90e6b..a2fc16ac01 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1402,7 +1402,7 @@ even though the user gets a free copy.
              height="10"
              layout="topleft"
              name="label position"
-             top_pad="5"
+             top_pad="10"
              width="121">
                 Position (meters)
             </text>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 1f168b0ccd..142103f03b 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3832,10 +3832,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_MiniMap_Label">Mini-map</string>
   <string name="Command_Move_Label">Walk / run / fly</string>
   <string name="Command_Outbox_Label">Merchant outbox</string>
-  <string name="Command_Pathfinding_Label">Pathfinding</string>
   <string name="Command_People_Label">People</string>
-  <string name="Command_PF_Characters_Label">Pathfinding Characters</string>
-  <string name="Command_PF_Linksets_Label">Pathfinding Linksets</string>
   <string name="Command_Picks_Label">Picks</string>
   <string name="Command_Places_Label">Places</string>
   <string name="Command_Preferences_Label">Preferences</string>
@@ -3861,10 +3858,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_MiniMap_Tooltip">Show nearby people</string>
   <string name="Command_Move_Tooltip">Moving your avatar</string>
   <string name="Command_Outbox_Tooltip">Transfer items to your marketplace for sale</string>
-  <string name="Command_Pathfinding_Tooltip">Information about pathfinding</string>
   <string name="Command_People_Tooltip">Friends, groups, and nearby people</string>
-  <string name="Command_PF_Characters_Tooltip">Manipulation of pathfinding characters</string>
-  <string name="Command_PF_Linksets_Tooltip">Manipulation of pathfinding linksets</string>
   <string name="Command_Picks_Tooltip">Places to show as favorites in your profile</string>
   <string name="Command_Places_Tooltip">Places you've saved</string>
   <string name="Command_Preferences_Tooltip">Preferences</string>
-- 
cgit v1.2.3