From fe637c5f9571e91c8e90440a0677e5c40b7bf648 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 19 Jan 2012 18:22:17 -0800
Subject: PATH-225: Replacing the Fixed and Walkable columns with a single
 State column.

---
 .../default/xui/en/floater_pathfinding_linksets.xml     | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
index a808a1f08f..d33df8fbb8 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -19,10 +19,9 @@
   <floater.string name="linksets_fetching_error">Error detected while querying for pathfinding linksets</floater.string>
   <floater.string name="linksets_fetching_done_none_found">No pathfinding linksets</floater.string>
   <floater.string name="linksets_fetching_done_available">[NUM_SELECTED] linksets selected out of [NUM_TOTAL]</floater.string>
-  <floater.string name="linkset_is_fixed">Fixed</floater.string>
-  <floater.string name="linkset_is_not_fixed">Not fixed</floater.string>
-  <floater.string name="linkset_is_walkable">Walkable</floater.string>
-  <floater.string name="linkset_is_not_walkable">--</floater.string>
+  <floater.string name="linkset_path_state_walkable">Walkable</floater.string>
+  <floater.string name="linkset_path_state_obstacle">Obstacle</floater.string>
+  <floater.string name="linkset_path_state_ignored">Ignored</floater.string>
   <floater.string name="linkset_is_phantom">Phantom</floater.string>
   <floater.string name="linkset_is_not_phantom">--</floater.string>
   <text
@@ -162,13 +161,9 @@
         name="dist_from_you"
         width="87" />
     <scroll_list.columns
-        label="Fixed"
-        name="is_fixed"
-        width="63" />
-    <scroll_list.columns
-        label="Walkable"
-        name="is_walkable"
-        width="73" />
+        label="State"
+        name="path_state"
+        width="136" />
     <scroll_list.columns
         label="Phantom"
         name="is_phantom"
-- 
cgit v1.2.3