From 92d6091538559e17f29a36b022ced7d781f469cb Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Wed, 26 Oct 2011 10:28:58 -0400
Subject: Simple menu hook testing

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 63e50b0b9f..b16b6afceb 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1092,6 +1092,14 @@
             <menu_item_call.on_visible
             function="File.VisibleUploadModel"/>
             </menu_item_call>
+          <menu_item_call
+            label="BuildNavMeshTest"
+            layout="topleft"
+            name="BuildNavMesh">
+            <menu_item_call.on_click
+             function="File.UploadNavMesh"
+             parameter="" />
+          </menu_item_call>
 	   <menu_item_call
              label="Bulk (L$[COST] per file)..."
              layout="topleft"
-- 
cgit v1.2.3


From 9f996fdc5684a3e55c9f86508979ad943e2eaded Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Thu, 10 Nov 2011 15:11:51 -0500
Subject: Initial commit for retrieving navmesh support

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index b16b6afceb..e7a0f1b0e0 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -650,6 +650,27 @@
             <menu_item_check.on_enable
              function="Build.Enabled" />
        </menu_item_check>
+	   
+	 <menu
+     create_jump_keys="true"
+     label="Pathing Tools"
+     name="Pathing Tools"
+     tear_off="true"
+     visible="true">
+       <menu_item_check
+         label="Retrieve NavMesh Src"
+         name="Show Pathing Tools">
+         <menu_item_check.on_click
+           function="PathingTools.RetrieveSrc" />
+       </menu_item_check>
+	    <menu_item_call
+         label="Toggle NavMesh Display"
+         name="Toggle NavMesh View">
+         <menu_item_call.on_click
+           function="PathingTools.ToggleNavMeshView" />
+       </menu_item_call>
+      </menu>  
+	   
        <menu
           create_jump_keys="true"
           label="Select Build Tool"
-- 
cgit v1.2.3


From 0538dcf62e3c13b50fc0828e930fa50e4050302d Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Thu, 1 Dec 2011 10:54:21 -0500
Subject:  New navmesh viewer options, rendering improvements, etc.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index e7a0f1b0e0..2f88b6fbf1 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -657,17 +657,25 @@
      name="Pathing Tools"
      tear_off="true"
      visible="true">
-       <menu_item_check
-         label="Retrieve NavMesh Src"
+       <menu_item_call
+         label="Retrieve Navigation Mesh Src"
          name="Show Pathing Tools">
-         <menu_item_check.on_click
+         <menu_item_call.on_click
            function="PathingTools.RetrieveSrc" />
-       </menu_item_check>
+         </menu_item_call>
+	   
 	    <menu_item_call
-         label="Toggle NavMesh Display"
-         name="Toggle NavMesh View">
+         label="Toggle Navigation Mesh Display"
+         name="Toggle Navigation Mesh View">
          <menu_item_call.on_click
            function="PathingTools.ToggleNavMeshView" />
+       </menu_item_call>
+	   
+	     <menu_item_call
+         label="Toggle Navigation Mesh Shape Display"
+         name="Toggle Navigation Mesh Shape View">
+         <menu_item_call.on_click
+           function="PathingTools.ToggleNavMeshShapeView" />
        </menu_item_call>
       </menu>  
 	   
-- 
cgit v1.2.3


From 98a8057bdc661394e362ebd5c3f3f26d92dac12f Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 13 Dec 2011 17:39:39 -0800
Subject: Introducing the initial hooks for building a pathfinding console
 floater.

---
 .../skins/default/xui/en/floater_pathfinding_console.xml     | 12 ++++++++++++
 indra/newview/skins/default/xui/en/strings.xml               |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_pathfinding_console.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
new file mode 100644
index 0000000000..1b8eda4328
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ open_positioning="cascading"
+ can_tear_off="false"
+ height="420"
+ layout="topleft"
+ name="floater_pathfinding"
+ help_topic="floater_pathfinding"
+ save_rect="true"
+ title="Pathfinding"
+ width="490">
+</floater>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index c25d1f57d6..63a55a975a 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3675,6 +3675,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Marketplace_Label">Marketplace</string>
   <string name="Command_MiniMap_Label">Mini-map</string>
   <string name="Command_Move_Label">Walk / run / fly</string>
+  <string name="Command_Pathfinding_Label">Pathfinding</string>
   <string name="Command_People_Label">People</string>
   <string name="Command_Picks_Label">Picks</string>
   <string name="Command_Places_Label">Places</string>
@@ -3700,6 +3701,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Marketplace_Tooltip">Go shopping</string>
   <string name="Command_MiniMap_Tooltip">Show nearby people</string>
   <string name="Command_Move_Tooltip">Moving your avatar</string>
+  <string name="Command_Pathfinding_Tooltip">Information about pathfinding</string>
   <string name="Command_People_Tooltip">Friends, groups, and nearby people</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>
-- 
cgit v1.2.3


From 4f5fc4921ff35cc12568eebc36e0318efbd34068 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 14 Dec 2011 11:48:39 -0800
Subject: Updating to the correct new llpathinglibrary pre-built package.

---
 .../skins/default/xui/en/floater_pathfinding_console.xml  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 1b8eda4328..f0fea1e52b 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -9,4 +9,19 @@
  save_rect="true"
  title="Pathfinding"
  width="490">
+  <text
+ height="30"
+ word_wrap="true"
+ use_ellipses="true"
+ type="string"
+ text_color="LabelSelectedDisabledColor"
+ length="1"
+ follows="left|top"
+ layout="topleft"
+ left="8"
+ name="text status"
+ top_pad="3"
+ width="285">
+    Show overlays:
+  </text>
 </floater>
-- 
cgit v1.2.3


From 7e9c5ce0ba15b22f94249de71d4dc92917a7c57d Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 14 Dec 2011 18:41:51 -0800
Subject: First pass at laying out the pathfinding console floater.

---
 .../default/xui/en/floater_pathfinding_console.xml | 412 +++++++++++++++++++--
 1 file changed, 390 insertions(+), 22 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index f0fea1e52b..f8d5d545f3 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -1,27 +1,395 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- open_positioning="cascading"
- can_tear_off="false"
- height="420"
- layout="topleft"
- name="floater_pathfinding"
- help_topic="floater_pathfinding"
- save_rect="true"
- title="Pathfinding"
- width="490">
-  <text
- height="30"
- word_wrap="true"
- use_ellipses="true"
- type="string"
- text_color="LabelSelectedDisabledColor"
- length="1"
- follows="left|top"
- layout="topleft"
- left="8"
- name="text status"
- top_pad="3"
- width="285">
+    open_positioning="cascading"
+    can_tear_off="false"
+    height="228"
+    layout="topleft"
+    name="floater_pathfinding"
+    help_topic="floater_pathfinding"
+    save_rect="true"
+    title="Pathfinding"
+    width="833">
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="12"
+      top="20"
+      width="208">
     Show overlays:
   </text>
+  <check_box
+      height="19"
+      label="Navmesh"
+      layout="topleft"
+      left="20"
+      name="DisplayNavmeshOverlay"
+      top_pad="5"
+      width="90" />
+  <check_box
+      height="19"
+      label="Exclusion volumes"
+      layout="topleft"
+      left="20"
+      name="DisplayExclusionVolumes"
+      top_pad="0"
+      width="90" />
+  <check_box
+      height="19"
+      label="Path"
+      layout="topleft"
+      left="20"
+      name="DisplayPath"
+      top_pad="0"
+      width="90" />
+  <check_box
+      height="19"
+      label="Water plane"
+      layout="topleft"
+      left="20"
+      name="DisplayWaterPlane"
+      top_pad="0"
+      width="90" />
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      layout="topleft"
+      left="12"
+      top_pad="10"
+      width="208">
+    Overlay on:
+  </text>
+  <radio_group
+      follows="top|left"
+      height="45"
+      layout="topleft"
+      left_delta="8"
+      name="region_settings_radio_group"
+      top_delta="17"
+      width="200">
+    <radio_item
+	label="Fixed physics geometry"
+	layout="topleft"
+	height="14"
+	name="DisplayOverlayOnFixed"/>
+    <radio_item
+	label="All renderable geometry"
+	layout="topleft"
+	height="14"
+	name="DisplayOverlayOnAll"/>
+  </radio_group>
+  <view_border
+      bevel_style="none"
+      follows="top|left"
+      height="203"
+      layout="topleft"
+      name="horiz_separator"
+      top="15"
+      left="228"
+      width="0"/>
+  <text
+      height="24"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      line_spacing.pixels="2"
+      follows="left|top"
+      layout="topleft"
+      left="240"
+      top="18"
+      width="208">
+Click on two points
+to see the path between them.
+  </text>
+  <radio_group
+      follows="top|left"
+      height="45"
+      layout="topleft"
+      left_delta="0"
+      name="region_settings_radio_group"
+      top_delta="33"
+      width="200">
+    <radio_item
+	label="Choose start point"
+	layout="topleft"
+	height="14"
+	name="DisplayOverlayOnFixed"/>
+    <radio_item
+	label="Choose end point"
+	layout="topleft"
+	height="14"
+	name="DisplayOverlayOnAll"/>
+  </radio_group>
+  <text
+      height="14"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="240"
+      width="208">
+    Character width
+  </text>
+  <slider
+      control_name="DebugBeaconLineWidth"
+      decimal_digits="1"
+      height="14"
+      increment="0.01"
+      initial_value="0"
+      layout="topleft"
+      max_val="2"
+      min_val="0.2"
+      name="beacon_width"
+      top_pad="7"
+      width="180" />
+  <text
+      height="14"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="240"
+      top_pad="10"
+      width="208">
+    Character type
+  </text>
+  <radio_group
+      follows="top|left"
+      height="20"
+      layout="topleft"
+      left_delta="0"
+      name="region_settings_radio_group"
+      top_delta="20"
+      width="200">
+    <radio_item
+	label="A"
+	height="14"
+	width="30"
+	name="DisplayOverlayOnFixed"/>
+  </radio_group>
+  <view_border
+      bevel_style="none"
+      follows="top|left"
+      height="203"
+      layout="topleft"
+      name="horiz_separator"
+      top="15"
+      left="456"
+      width="0"/>
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="470"
+      top="18"
+      width="180">
+    View / edit linkset attributes:
+  </text>
+  <button
+      follows="left|top"
+      height="21"
+      label="Linksets..."
+      layout="topleft"
+      name="linksets"
+      width="96"/>
+  <text
+      height="25"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      line_spacing.pixels="4"
+      follows="left|top"
+      layout="topleft"
+      top_pad="22"
+      width="180">
+If you have made changes
+to objects or terrain:
+  </text>
+  <button
+      follows="left|top"
+      height="22"
+      label="Rebuild navmesh"
+      layout="topleft"
+      name="linksets"
+      top_pad="14"
+      width="149"/>
+  <text
+      height="25"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      line_spacing.pixels="4"
+      follows="left|top"
+      layout="topleft"
+      top_pad="14"
+      width="180">
+To load the current state
+of the mesh:
+  </text>
+  <button
+      follows="left|top"
+      height="21"
+      label="Refresh"
+      layout="topleft"
+      name="refresh"
+      top_pad="9"
+      width="95"/>
+  <view_border
+      bevel_style="none"
+      follows="top|left"
+      height="203"
+      layout="topleft"
+      name="horiz_separator"
+      top="15"
+      left="667"
+      width="0"/>
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="689"
+      top="18"
+      width="208">
+    Terrain materials
+  </text>
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      top_pad="17"
+      width="208">
+    A
+  </text>
+  <line_editor
+      border_style="line"
+      border_thickness="1"
+      follows="top|left"
+      height="21"
+      layout="topleft"
+      left_delta="22"
+      max_length_bytes="10"
+      name="estate"
+      width="46" />
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      layout="topleft"
+      left_pad="-68"
+      top_pad="17"
+      width="208">
+    B
+  </text>
+  <line_editor
+      border_style="line"
+      border_thickness="1"
+      follows="top|left"
+      height="21"
+      layout="topleft"
+      left_delta="22"
+      max_length_bytes="10"
+      name="estate"
+      width="46" />
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      layout="topleft"
+      left_pad="-68"
+      top_pad="17"
+      width="208">
+    C
+  </text>
+  <line_editor
+      border_style="line"
+      border_thickness="1"
+      follows="top|left"
+      height="21"
+      layout="topleft"
+      left_delta="22"
+      max_length_bytes="10"
+      name="estate"
+      width="46" />
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      layout="topleft"
+      left_pad="-68"
+      top_pad="17"
+      width="208">
+    D
+  </text>
+  <line_editor
+      border_style="line"
+      border_thickness="1"
+      follows="top|left"
+      height="21"
+      layout="topleft"
+      left_delta="22"
+      max_length_bytes="10"
+      name="estate"
+      width="46" />
+  <text
+      height="38"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      line_spacing.pixels="4"
+      follows="left|top"
+      layout="topleft"
+      left_pad="-68"
+      top_pad="14"
+      width="180">
+Rebuild the navmesh
+after making any
+changes.
+  </text>
 </floater>
-- 
cgit v1.2.3


From e90cdf6682cacd261b2927cc4cecf06dfe5a5447 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 15 Dec 2011 10:31:25 -0800
Subject: Introducing the initial hooks for building the pathfinding linkset
 floater.

---
 .../xui/en/floater_pathfinding_linksets.xml        | 26 ++++++++++++++++++++++
 indra/newview/skins/default/xui/en/strings.xml     |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
new file mode 100644
index 0000000000..074ffd5f5d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+    open_positioning="cascading"
+    can_tear_off="false"
+    height="355"
+    layout="topleft"
+    name="floater_pathfinding_linksets"
+    help_topic="floater_pathfinding_linksets"
+    save_rect="true"
+    title="Pathfinding linksets"
+    width="950">
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="12"
+      top="20"
+      width="208">
+    Filter list by:
+  </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 63a55a975a..664d60f8b5 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3677,6 +3677,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Move_Label">Walk / run / fly</string>
   <string name="Command_Pathfinding_Label">Pathfinding</string>
   <string name="Command_People_Label">People</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>
@@ -3703,6 +3704,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Move_Tooltip">Moving your avatar</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_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


From e6b3ab35ddf9e5b2c1f51b08dfdf548c2847250f Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 15 Dec 2011 12:28:57 -0800
Subject: First pass at laying out the pathfinding linksets floater.

---
 .../xui/en/floater_pathfinding_linksets.xml        | 353 ++++++++++++++++++++-
 1 file changed, 348 insertions(+), 5 deletions(-)

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

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 074ffd5f5d..f8da37fe6f 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -2,7 +2,7 @@
 <floater
     open_positioning="cascading"
     can_tear_off="false"
-    height="355"
+    height="330"
     layout="topleft"
     name="floater_pathfinding_linksets"
     help_topic="floater_pathfinding_linksets"
@@ -11,16 +11,359 @@
     width="950">
   <text
       height="13"
-      word_wrap="true"
+      word_wrap="false"
       use_ellipses="false"
       type="string"
       text_color="LabelTextColor"
       length="1"
       follows="left|top"
       layout="topleft"
-      left="12"
-      top="20"
-      width="208">
+      left="20"
+      top="16"
+      width="90">
     Filter list by:
   </text>
+  <text
+      height="13"
+      word_wrap="false"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="109"
+      top="16"
+      width="94">
+    Portion of name
+  </text>
+  <line_editor
+      border_style="line"
+      border_thickness="1"
+      follows="top|left"
+      height="20"
+      layout="topleft"
+      left_delta="93"
+      top="11"
+      max_length_bytes="10"
+      name="estate"
+      width="115" />
+  <text
+      height="13"
+      word_wrap="false"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="336"
+      top="16"
+      width="132">
+    Portion of description
+  </text>
+  <line_editor
+      border_style="line"
+      border_thickness="1"
+      follows="top|left"
+      height="20"
+      layout="topleft"
+      left_delta="131"
+      top="11"
+      max_length_bytes="10"
+      name="estate"
+      width="115" />
+  <check_box
+      height="19"
+      label="Fixed"
+      layout="topleft"
+      left="591"
+      top="14"
+      name="DisplayNavmeshOverlay"
+      width="90" />
+  <check_box
+      height="19"
+      label="Walkable"
+      layout="topleft"
+      left="671"
+      top="14"
+      name="DisplayNavmeshOverlay"
+      width="90" />
+  <button
+      follows="right|top"
+      height="21"
+      label="Apply"
+      layout="topleft"
+      name="linksets"
+      top="11"
+      left="769"
+      width="73"/>
+  <button
+      follows="right|top"
+      height="21"
+      label="Clear"
+      layout="topleft"
+      name="linksets"
+      top="11"
+      left="851"
+      width="73"/>
+  <name_list
+      column_padding="0"
+      draw_heading="true"
+      follows="all"
+      height="135"
+      layout="topleft"
+      left="18"
+      top="48"
+      name="owner list"
+      name_column="name"
+      width="910">
+    <name_list.columns
+	label="Name (root prim)"
+	name="name"
+	width="152" />
+    <name_list.columns
+	label="Description (root prim)"
+	name="description"
+	width="191" />
+    <name_list.columns
+	label="Land impact"
+	name="land_impact"
+	width="85" />
+    <name_list.columns
+	label="Dist from you"
+	name="dist_from_you"
+	width="87" />
+    <name_list.columns
+	label="Fixed"
+	name="fixed"
+	width="63" />
+    <name_list.columns
+	label="Walkable"
+	name="walkable"
+	width="73" />
+    <name_list.columns
+	label="Phantom"
+	name="phantom"
+	width="74" />
+    <name_list.columns
+	label="A %"
+	name="a_percent"
+	width="41" />
+    <name_list.columns
+	label="B %"
+	name="b_percent"
+	width="41" />
+    <name_list.columns
+	label="C %"
+	name="c_percent"
+	width="41" />
+    <name_list.columns
+	label="D %"
+	name="d_percent"
+	width="41" />
+  </name_list>
+  <text
+      height="13"
+      word_wrap="false"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      top="200"
+      width="500">
+    0 linsets selected out of 2
+  </text>
+  <button
+      follows="right|top"
+      height="21"
+      label="Refresh list"
+      layout="topleft"
+      name="linksets"
+      top="200"
+      left="568"
+      width="115"/>
+  <button
+      follows="right|top"
+      height="21"
+      label="Select all"
+      layout="topleft"
+      name="linksets"
+      top="200"
+      left="690"
+      width="115"/>
+  <button
+      follows="right|top"
+      height="21"
+      label="Select none"
+      layout="topleft"
+      name="linksets"
+      top="200"
+      left="812"
+      width="115"/>
+  <view_border
+      bevel_style="none"
+      follows="top|left"
+      height="0"
+      layout="topleft"
+      name="horiz_separator"
+      top="230"
+      left="20"
+      width="912"/>
+  <text
+      height="13"
+      word_wrap="false"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      top_pad="12"
+      width="910">
+    Select row(s) to edit attributes of linkset(s).  If a linkset is deleted or returned to inventory, attributes assigned to it will be lost.
+  </text>
+  <check_box
+      height="19"
+      label="Fixed"
+      layout="topleft"
+      name="DisplayNavmeshOverlay"
+      top_pad="10"
+      width="90" />
+  <check_box
+      height="19"
+      label="Walkable"
+      layout="topleft"
+      name="DisplayNavmeshOverlay"
+      top_pad="5"
+      left="38"
+      width="90" />
+  <text
+      height="13"
+      word_wrap="false"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="159"
+      top="271"
+      width="200">
+    Walkability coefficients
+  </text>
+  <text
+      height="13"
+      word_wrap="false"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      top_pad="12"
+      width="90">
+    A
+  </text>
+  <line_editor
+      border_style="line"
+      border_thickness="1"
+      follows="top|left"
+      height="20"
+      layout="topleft"
+      left_delta="14"
+      max_length_bytes="10"
+      name="estate"
+      width="45" />
+  <text
+      height="13"
+      word_wrap="false"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="248"
+      top_pad="-13"
+      width="90">
+    B
+  </text>
+  <line_editor
+      border_style="line"
+      border_thickness="1"
+      follows="top|left"
+      height="20"
+      layout="topleft"
+      left_delta="14"
+      max_length_bytes="10"
+      name="estate"
+      width="45" />
+  <text
+      height="13"
+      word_wrap="false"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="337"
+      top_pad="-13"
+      width="90">
+    C
+  </text>
+  <line_editor
+      border_style="line"
+      border_thickness="1"
+      follows="top|left"
+      height="20"
+      layout="topleft"
+      left_delta="14"
+      max_length_bytes="10"
+      name="estate"
+      width="45" />
+  <text
+      height="13"
+      word_wrap="false"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="426"
+      top_pad="-13"
+      width="90">
+    D
+  </text>
+  <line_editor
+      border_style="line"
+      border_thickness="1"
+      follows="top|left"
+      height="20"
+      layout="topleft"
+      left_delta="14"
+      max_length_bytes="10"
+      name="estate"
+      width="45" />
+  <check_box
+      height="19"
+      label="Phantom"
+      layout="topleft"
+      name="DisplayNavmeshOverlay"
+      top="271"
+      left="559"
+      width="90" />
+  <button
+      follows="right|top"
+      height="21"
+      label="Apply changes"
+      layout="topleft"
+      name="linksets"
+      top="270"
+      left="735"
+      width="134"/>
 </floater>
-- 
cgit v1.2.3


From b793c3aa1986d352cb90994d6d283eab55a7a3ba Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 15 Dec 2011 16:26:21 -0800
Subject: Refinement on the pathfinding console floater.

---
 .../default/xui/en/floater_pathfinding_console.xml | 54 +++++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index f8d5d545f3..39ea9495ff 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -155,7 +155,21 @@ to see the path between them.
       min_val="0.2"
       name="beacon_width"
       top_pad="7"
-      width="180" />
+      width="145" />
+  <text
+      height="14"
+      word_wrap="false"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      top_pad="-14"
+      left="382"
+      width="208">
+    m
+  </text>
   <text
       height="14"
       word_wrap="true"
@@ -183,7 +197,45 @@ to see the path between them.
 	height="14"
 	width="30"
 	name="DisplayOverlayOnFixed"/>
+    <radio_item
+	label="B"
+	height="14"
+	width="30"
+	layout="topleft"
+	top="4"
+	left="50"
+	name="DisplayOverlayOnFixed"/>
+    <radio_item
+	label="C"
+	height="14"
+	width="30"
+	layout="topleft"
+	top="4"
+	left="100"
+	name="DisplayOverlayOnFixed"/>
+    <radio_item
+	label="D"
+	height="14"
+	width="30"
+	layout="topleft"
+	top="4"
+	left="150"
+	name="DisplayOverlayOnFixed"/>
   </radio_group>
+  <text
+      height="14"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="DrYellow"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="240"
+      top_pad="10"
+      width="208">
+    Result: No path found.
+  </text>
   <view_border
       bevel_style="none"
       follows="top|left"
-- 
cgit v1.2.3


From dcd945fc74b57313da96e97f7de4ee0b6b81ef70 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 16 Dec 2011 10:15:43 -0800
Subject: Adding functionality for the linksets button on the console to open
 the linksets floater.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 39ea9495ff..dfb2eca4c8 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -264,7 +264,7 @@ to see the path between them.
       height="21"
       label="Linksets..."
       layout="topleft"
-      name="linksets"
+      name="view_and_edit_linksets"
       width="96"/>
   <text
       height="25"
-- 
cgit v1.2.3


From 6b2df5d57a4d973dea8cac99feb47330ccaa2397 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 16 Dec 2011 11:06:36 -0800
Subject: Moving the pathfinding console link into the toolbar under the Build
 menu.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 66 +++++++++++++---------
 1 file changed, 38 insertions(+), 28 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 28e9052ddb..d2a5556124 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -692,34 +692,6 @@
              function="Build.Enabled" />
        </menu_item_check>
 	   
-	 <menu
-     create_jump_keys="true"
-     label="Pathing Tools"
-     name="Pathing Tools"
-     tear_off="true"
-     visible="true">
-       <menu_item_call
-         label="Retrieve Navigation Mesh Src"
-         name="Show Pathing Tools">
-         <menu_item_call.on_click
-           function="PathingTools.RetrieveSrc" />
-         </menu_item_call>
-	   
-	    <menu_item_call
-         label="Toggle Navigation Mesh Display"
-         name="Toggle Navigation Mesh View">
-         <menu_item_call.on_click
-           function="PathingTools.ToggleNavMeshView" />
-       </menu_item_call>
-	   
-	     <menu_item_call
-         label="Toggle Navigation Mesh Shape Display"
-         name="Toggle Navigation Mesh Shape View">
-         <menu_item_call.on_click
-           function="PathingTools.ToggleNavMeshShapeView" />
-       </menu_item_call>
-      </menu>  
-	   
        <menu
           create_jump_keys="true"
           label="Select Build Tool"
@@ -976,6 +948,44 @@
           </menu_item_call>
         </menu>
 
+        <menu_item_call
+            label="Pathfinding..."
+            name="pathfinding_menu_item">
+            <menu_item_call.on_click
+                function="Floater.ToggleOrBringToFront"
+                parameter="pathfinding_console" />
+        </menu_item_call>
+
+        <menu_item_separator/>
+
+        <menu
+            create_jump_keys="true"
+            label="Pathing Tools"
+            name="Pathing Tools"
+            tear_off="true"
+            visible="true">
+          <menu_item_call
+              label="Retrieve Navigation Mesh Src"
+              name="Show Pathing Tools">
+            <menu_item_call.on_click
+                function="PathingTools.RetrieveSrc" />
+          </menu_item_call>
+
+          <menu_item_call
+              label="Toggle Navigation Mesh Display"
+              name="Toggle Navigation Mesh View">
+            <menu_item_call.on_click
+                function="PathingTools.ToggleNavMeshView" />
+          </menu_item_call>
+
+          <menu_item_call
+              label="Toggle Navigation Mesh Shape Display"
+              name="Toggle Navigation Mesh Shape View">
+            <menu_item_call.on_click
+                function="PathingTools.ToggleNavMeshShapeView" />
+          </menu_item_call>
+        </menu>
+
         <menu_item_separator/>
 
         <menu
-- 
cgit v1.2.3


From 64acf29c53639cbd3784f5bcc617b02985cbe412 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 16 Dec 2011 17:30:12 -0800
Subject: Hooking the navmesh and exclusion volumes render states up to the
 pathfinding console floater.

---
 .../skins/default/xui/en/floater_pathfinding_console.xml    |  8 ++++----
 indra/newview/skins/default/xui/en/menu_viewer.xml          | 13 -------------
 2 files changed, 4 insertions(+), 17 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index dfb2eca4c8..ff1cf81d4e 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -28,7 +28,7 @@
       label="Navmesh"
       layout="topleft"
       left="20"
-      name="DisplayNavmeshOverlay"
+      name="show_navmesh_overlay"
       top_pad="5"
       width="90" />
   <check_box
@@ -36,7 +36,7 @@
       label="Exclusion volumes"
       layout="topleft"
       left="20"
-      name="DisplayExclusionVolumes"
+      name="show_exclusion_volumes"
       top_pad="0"
       width="90" />
   <check_box
@@ -44,7 +44,7 @@
       label="Path"
       layout="topleft"
       left="20"
-      name="DisplayPath"
+      name="show_path"
       top_pad="0"
       width="90" />
   <check_box
@@ -52,7 +52,7 @@
       label="Water plane"
       layout="topleft"
       left="20"
-      name="DisplayWaterPlane"
+      name="show_water_plane"
       top_pad="0"
       width="90" />
   <text
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index d2a5556124..986f7b226e 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -971,19 +971,6 @@
                 function="PathingTools.RetrieveSrc" />
           </menu_item_call>
 
-          <menu_item_call
-              label="Toggle Navigation Mesh Display"
-              name="Toggle Navigation Mesh View">
-            <menu_item_call.on_click
-                function="PathingTools.ToggleNavMeshView" />
-          </menu_item_call>
-
-          <menu_item_call
-              label="Toggle Navigation Mesh Shape Display"
-              name="Toggle Navigation Mesh Shape View">
-            <menu_item_call.on_click
-                function="PathingTools.ToggleNavMeshShapeView" />
-          </menu_item_call>
         </menu>
 
         <menu_item_separator/>
-- 
cgit v1.2.3


From 1598724b462b062670a94353e397b092c1dbb598 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 16 Dec 2011 18:11:43 -0800
Subject: Moving the call to initialize the LLPathingLib instance to the
 pathfinding console floater onOpen() callback.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 17 -----------------
 1 file changed, 17 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 986f7b226e..b90d65b83a 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -958,23 +958,6 @@
 
         <menu_item_separator/>
 
-        <menu
-            create_jump_keys="true"
-            label="Pathing Tools"
-            name="Pathing Tools"
-            tear_off="true"
-            visible="true">
-          <menu_item_call
-              label="Retrieve Navigation Mesh Src"
-              name="Show Pathing Tools">
-            <menu_item_call.on_click
-                function="PathingTools.RetrieveSrc" />
-          </menu_item_call>
-
-        </menu>
-
-        <menu_item_separator/>
-
         <menu
          create_jump_keys="true"
          label="Options"
-- 
cgit v1.2.3


From 11bb14fe029a6764717475cdf53bb6eed8c1f9c9 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 19 Dec 2011 14:29:10 -0800
Subject: Stubbing out functionality for catching the overlay display render
 state switch.

---
 .../default/xui/en/floater_pathfinding_console.xml | 89 ++++++++++++----------
 1 file changed, 47 insertions(+), 42 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index ff1cf81d4e..75219d9df9 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -6,7 +6,9 @@
     layout="topleft"
     name="floater_pathfinding"
     help_topic="floater_pathfinding"
+    reuse_instance="true"
     save_rect="true"
+    single_instance="true"
     title="Pathfinding"
     width="833">
   <text
@@ -71,21 +73,24 @@
   <radio_group
       follows="top|left"
       height="45"
+      value="0"
       layout="topleft"
       left_delta="8"
-      name="region_settings_radio_group"
+      name="region_overlay_display"
       top_delta="17"
       width="200">
     <radio_item
-	label="Fixed physics geometry"
-	layout="topleft"
-	height="14"
-	name="DisplayOverlayOnFixed"/>
+        label="Fixed physics geometry"
+        layout="topleft"
+        height="14"
+        name="display_overlay_on_fixed"
+        value="0"/>
     <radio_item
-	label="All renderable geometry"
-	layout="topleft"
-	height="14"
-	name="DisplayOverlayOnAll"/>
+        label="All renderable geometry"
+        layout="topleft"
+        height="14"
+        name="display_overlay_on_all"
+        value="1"/>
   </radio_group>
   <view_border
       bevel_style="none"
@@ -121,15 +126,15 @@ to see the path between them.
       top_delta="33"
       width="200">
     <radio_item
-	label="Choose start point"
-	layout="topleft"
-	height="14"
-	name="DisplayOverlayOnFixed"/>
+        label="Choose start point"
+        layout="topleft"
+        height="14"
+        name="DisplayOverlayOnFixed"/>
     <radio_item
-	label="Choose end point"
-	layout="topleft"
-	height="14"
-	name="DisplayOverlayOnAll"/>
+        label="Choose end point"
+        layout="topleft"
+        height="14"
+        name="DisplayOverlayOnAll"/>
   </radio_group>
   <text
       height="14"
@@ -193,34 +198,34 @@ to see the path between them.
       top_delta="20"
       width="200">
     <radio_item
-	label="A"
-	height="14"
-	width="30"
-	name="DisplayOverlayOnFixed"/>
+        label="A"
+        height="14"
+        width="30"
+        name="DisplayOverlayOnFixed"/>
     <radio_item
-	label="B"
-	height="14"
-	width="30"
-	layout="topleft"
-	top="4"
-	left="50"
-	name="DisplayOverlayOnFixed"/>
+        label="B"
+        height="14"
+        width="30"
+        layout="topleft"
+        top="4"
+        left="50"
+        name="DisplayOverlayOnFixed"/>
     <radio_item
-	label="C"
-	height="14"
-	width="30"
-	layout="topleft"
-	top="4"
-	left="100"
-	name="DisplayOverlayOnFixed"/>
+        label="C"
+        height="14"
+        width="30"
+        layout="topleft"
+        top="4"
+        left="100"
+        name="DisplayOverlayOnFixed"/>
     <radio_item
-	label="D"
-	height="14"
-	width="30"
-	layout="topleft"
-	top="4"
-	left="150"
-	name="DisplayOverlayOnFixed"/>
+        label="D"
+        height="14"
+        width="30"
+        layout="topleft"
+        top="4"
+        left="150"
+        name="DisplayOverlayOnFixed"/>
   </radio_group>
   <text
       height="14"
-- 
cgit v1.2.3


From 101a674c73ad3007f9a40fc4593df1d0eaa4fd99 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 19 Dec 2011 16:04:48 -0800
Subject: Stubbing out functionality for catching the path selection state
 switch.

---
 .../skins/default/xui/en/floater_pathfinding_console.xml       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 75219d9df9..501451999d 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -118,23 +118,27 @@ Click on two points
 to see the path between them.
   </text>
   <radio_group
+      allow_deselect="true"
       follows="top|left"
       height="45"
       layout="topleft"
       left_delta="0"
-      name="region_settings_radio_group"
+      name="path_selection"
       top_delta="33"
+      value="0"
       width="200">
     <radio_item
         label="Choose start point"
         layout="topleft"
         height="14"
-        name="DisplayOverlayOnFixed"/>
+        name="choose_path_start_point"
+        value="1"/>
     <radio_item
         label="Choose end point"
         layout="topleft"
         height="14"
-        name="DisplayOverlayOnAll"/>
+        name="choose_path_end_point"
+        value="2"/>
   </radio_group>
   <text
       height="14"
-- 
cgit v1.2.3


From 9897c4de69c57ddeae6b94a857e532c0552865cf Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 19 Dec 2011 16:36:00 -0800
Subject: Stubbing out functionality for catching the character width slider
 changes.

---
 indra/newview/skins/default/xui/en/floater_pathfinding_console.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 501451999d..444347808b 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -154,16 +154,15 @@ to see the path between them.
     Character width
   </text>
   <slider
-      control_name="DebugBeaconLineWidth"
       decimal_digits="1"
       height="14"
-      increment="0.01"
-      initial_value="0"
+      increment="0.1"
       layout="topleft"
       max_val="2"
       min_val="0.2"
-      name="beacon_width"
+      name="character_width"
       top_pad="7"
+      value="1"
       width="145" />
   <text
       height="14"
-- 
cgit v1.2.3


From 6a078814cdd55105304fec41712dbd635e18d900 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 19 Dec 2011 17:01:23 -0800
Subject: Stubbing out functionality for catching the character type switch
 states.

---
 .../default/xui/en/floater_pathfinding_console.xml  | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 444347808b..88905dd094 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -73,7 +73,7 @@
   <radio_group
       follows="top|left"
       height="45"
-      value="0"
+      value="1"
       layout="topleft"
       left_delta="8"
       name="region_overlay_display"
@@ -84,13 +84,13 @@
         layout="topleft"
         height="14"
         name="display_overlay_on_fixed"
-        value="0"/>
+        value="1"/>
     <radio_item
         label="All renderable geometry"
         layout="topleft"
         height="14"
         name="display_overlay_on_all"
-        value="1"/>
+        value="2"/>
   </radio_group>
   <view_border
       bevel_style="none"
@@ -197,14 +197,16 @@ to see the path between them.
       height="20"
       layout="topleft"
       left_delta="0"
-      name="region_settings_radio_group"
+      name="character_type"
       top_delta="20"
+      value="1"
       width="200">
     <radio_item
         label="A"
         height="14"
         width="30"
-        name="DisplayOverlayOnFixed"/>
+	value="1"
+        name="character_type_a"/>
     <radio_item
         label="B"
         height="14"
@@ -212,7 +214,8 @@ to see the path between them.
         layout="topleft"
         top="4"
         left="50"
-        name="DisplayOverlayOnFixed"/>
+	value="2"
+        name="character_type_b"/>
     <radio_item
         label="C"
         height="14"
@@ -220,7 +223,8 @@ to see the path between them.
         layout="topleft"
         top="4"
         left="100"
-        name="DisplayOverlayOnFixed"/>
+	value="3"
+        name="character_type_c"/>
     <radio_item
         label="D"
         height="14"
@@ -228,7 +232,8 @@ to see the path between them.
         layout="topleft"
         top="4"
         left="150"
-        name="DisplayOverlayOnFixed"/>
+	value="4"
+        name="character_type_d"/>
   </radio_group>
   <text
       height="14"
-- 
cgit v1.2.3


From 34a847fabdfb42c7a6cf555c10fed095c6d8b2f2 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 19 Dec 2011 17:16:13 -0800
Subject: Stubbing out functionality for catching the rebuild and refresh
 navmesh button clicks.

---
 .../skins/default/xui/en/floater_pathfinding_console.xml       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 88905dd094..72d32b077b 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -97,7 +97,7 @@
       follows="top|left"
       height="203"
       layout="topleft"
-      name="horiz_separator"
+      name="horiz_separator_1"
       top="15"
       left="228"
       width="0"/>
@@ -254,7 +254,7 @@ to see the path between them.
       follows="top|left"
       height="203"
       layout="topleft"
-      name="horiz_separator"
+      name="horiz_separator_2"
       top="15"
       left="456"
       width="0"/>
@@ -299,7 +299,7 @@ to objects or terrain:
       height="22"
       label="Rebuild navmesh"
       layout="topleft"
-      name="linksets"
+      name="rebuild_navmesh"
       top_pad="14"
       width="149"/>
   <text
@@ -322,7 +322,7 @@ of the mesh:
       height="21"
       label="Refresh"
       layout="topleft"
-      name="refresh"
+      name="refresh_navmesh"
       top_pad="9"
       width="95"/>
   <view_border
@@ -330,7 +330,7 @@ of the mesh:
       follows="top|left"
       height="203"
       layout="topleft"
-      name="horiz_separator"
+      name="horiz_separator_3"
       top="15"
       left="667"
       width="0"/>
-- 
cgit v1.2.3


From 32fe974ac272ac5f92dd4c5c84e482b0acb36fe2 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 19 Dec 2011 17:49:47 -0800
Subject: Stubbing out functionality for catching the terrain material
 properties changes.

---
 .../newview/skins/default/xui/en/floater_pathfinding_console.xml  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 72d32b077b..5716ec30b7 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -369,7 +369,7 @@ of the mesh:
       layout="topleft"
       left_delta="22"
       max_length_bytes="10"
-      name="estate"
+      name="terrain_material_a"
       width="46" />
   <text
       height="13"
@@ -392,7 +392,7 @@ of the mesh:
       layout="topleft"
       left_delta="22"
       max_length_bytes="10"
-      name="estate"
+      name="terrain_material_b"
       width="46" />
   <text
       height="13"
@@ -415,7 +415,7 @@ of the mesh:
       layout="topleft"
       left_delta="22"
       max_length_bytes="10"
-      name="estate"
+      name="terrain_material_c"
       width="46" />
   <text
       height="13"
@@ -438,7 +438,7 @@ of the mesh:
       layout="topleft"
       left_delta="22"
       max_length_bytes="10"
-      name="estate"
+      name="terrain_material_d"
       width="46" />
   <text
       height="38"
-- 
cgit v1.2.3


From 10614ebd917f4dbb8a16e8a0473409c42f8d7608 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 4 Jan 2012 15:52:20 -0800
Subject: Hijaking the land status messaging for temporary development of the
 pathfinding linksets floater.

---
 .../xui/en/floater_pathfinding_linksets.xml        | 110 +++++++++++----------
 1 file changed, 58 insertions(+), 52 deletions(-)

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

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 f8da37fe6f..587b62377b 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -6,9 +6,14 @@
     layout="topleft"
     name="floater_pathfinding_linksets"
     help_topic="floater_pathfinding_linksets"
+    reuse_instance="true"
     save_rect="true"
+    single_instance="true"
     title="Pathfinding linksets"
     width="950">
+  <floater.string name="linksets_fetching">Finking pathfinding linksets ...</floater.string>
+  <floater.string name="linksets_none_found">No pathfinding linksets</floater.string>
+  <floater.string name="linksets_available">[NUM_SELECTED] linksets selected out of [NUM_TOTAL]</floater.string>
   <text
       height="13"
       word_wrap="false"
@@ -107,7 +112,7 @@
       top="11"
       left="851"
       width="73"/>
-  <name_list
+  <scroll_list
       column_padding="0"
       draw_heading="true"
       follows="all"
@@ -115,54 +120,54 @@
       layout="topleft"
       left="18"
       top="48"
-      name="owner list"
-      name_column="name"
+      multi_select="true"
+      name="pathfinding_linksets"
       width="910">
-    <name_list.columns
-	label="Name (root prim)"
-	name="name"
-	width="152" />
-    <name_list.columns
-	label="Description (root prim)"
-	name="description"
-	width="191" />
-    <name_list.columns
-	label="Land impact"
-	name="land_impact"
-	width="85" />
-    <name_list.columns
-	label="Dist from you"
-	name="dist_from_you"
-	width="87" />
-    <name_list.columns
-	label="Fixed"
-	name="fixed"
-	width="63" />
-    <name_list.columns
-	label="Walkable"
-	name="walkable"
-	width="73" />
-    <name_list.columns
-	label="Phantom"
-	name="phantom"
-	width="74" />
-    <name_list.columns
-	label="A %"
-	name="a_percent"
-	width="41" />
-    <name_list.columns
-	label="B %"
-	name="b_percent"
-	width="41" />
-    <name_list.columns
-	label="C %"
-	name="c_percent"
-	width="41" />
-    <name_list.columns
-	label="D %"
-	name="d_percent"
-	width="41" />
-  </name_list>
+    <scroll_list.columns
+        label="Name (root prim)"
+        name="name"
+        width="152" />
+    <scroll_list.columns
+        label="Description (root prim)"
+        name="description"
+        width="191" />
+    <scroll_list.columns
+        label="Land impact"
+        name="land_impact"
+        width="85" />
+    <scroll_list.columns
+        label="Dist from you"
+        name="dist_from_you"
+        width="87" />
+    <scroll_list.columns
+        label="Fixed"
+        name="fixed"
+        width="63" />
+    <scroll_list.columns
+        label="Walkable"
+        name="walkable"
+        width="73" />
+    <scroll_list.columns
+        label="Phantom"
+        name="phantom"
+        width="74" />
+    <scroll_list.columns
+        label="A %"
+        name="a_percent"
+        width="41" />
+    <scroll_list.columns
+        label="B %"
+        name="b_percent"
+        width="41" />
+    <scroll_list.columns
+        label="C %"
+        name="c_percent"
+        width="41" />
+    <scroll_list.columns
+        label="D %"
+        name="d_percent"
+        width="41" />
+  </scroll_list>
   <text
       height="13"
       word_wrap="false"
@@ -172,16 +177,17 @@
       length="1"
       follows="left|top"
       layout="topleft"
+      name="linksets_status"
       top="200"
       width="500">
-    0 linsets selected out of 2
+    Linksets:
   </text>
   <button
       follows="right|top"
       height="21"
       label="Refresh list"
       layout="topleft"
-      name="linksets"
+      name="refresh_linksets_list"
       top="200"
       left="568"
       width="115"/>
@@ -190,7 +196,7 @@
       height="21"
       label="Select all"
       layout="topleft"
-      name="linksets"
+      name="select_all_linksets"
       top="200"
       left="690"
       width="115"/>
@@ -199,7 +205,7 @@
       height="21"
       label="Select none"
       layout="topleft"
-      name="linksets"
+      name="select_none_linksets"
       top="200"
       left="812"
       width="115"/>
-- 
cgit v1.2.3


From 1eea77add246604315711e9e2635078dc038d42f Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 9 Jan 2012 17:05:06 -0800
Subject: PATH-142: Initial pass at hooking up the NavmeshData GET service to
 the UI.

---
 .../default/xui/en/floater_pathfinding_linksets.xml      | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

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

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 587b62377b..06f5d92742 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -11,9 +11,17 @@
     single_instance="true"
     title="Pathfinding linksets"
     width="950">
-  <floater.string name="linksets_fetching">Finking pathfinding linksets ...</floater.string>
+  <floater.string name="linksets_fetching">Querying for pathfinding linksets ...</floater.string>
+  <floater.string name="linksets_fetching_inprogress">Querying for pathfinding linksets (already in progress) ...</floater.string>
+  <floater.string name="linksets_fetching_error">Error detected while querying for pathfinding linksets</floater.string>
   <floater.string name="linksets_none_found">No pathfinding linksets</floater.string>
   <floater.string name="linksets_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_is_phantom">Phantom</floater.string>
+  <floater.string name="linkset_is_not_phantom">--</floater.string>
   <text
       height="13"
       word_wrap="false"
@@ -141,15 +149,15 @@
         width="87" />
     <scroll_list.columns
         label="Fixed"
-        name="fixed"
+        name="is_fixed"
         width="63" />
     <scroll_list.columns
         label="Walkable"
-        name="walkable"
+        name="is_walkable"
         width="73" />
     <scroll_list.columns
         label="Phantom"
-        name="phantom"
+        name="is_phantom"
         width="74" />
     <scroll_list.columns
         label="A %"
-- 
cgit v1.2.3


From ebeddd7fd9ae2fa82a35baa0cab9aff024c2c9f1 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 9 Jan 2012 18:15:32 -0800
Subject: PATH-142: Refined the linksets status messaging functionlity.

---
 .../skins/default/xui/en/floater_pathfinding_linksets.xml     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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

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 06f5d92742..2ae2795cb5 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -11,11 +11,14 @@
     single_instance="true"
     title="Pathfinding linksets"
     width="950">
-  <floater.string name="linksets_fetching">Querying for pathfinding linksets ...</floater.string>
-  <floater.string name="linksets_fetching_inprogress">Querying for pathfinding linksets (already in progress) ...</floater.string>
+  <floater.string name="linksets_fetching_initial"></floater.string>
+  <floater.string name="linksets_fetching_starting">Building query for pathfinding linksets ...</floater.string>
+  <floater.string name="linksets_fetching_inprogress">Querying for pathfinding linksets ...</floater.string>
+  <floater.string name="linksets_fetching_inprogress_multi_request">Querying for pathfinding linksets (already in progress) ...</floater.string>
+  <floater.string name="linksets_fetching_received">Loading pathfinding linksets data from response ...</floater.string>
   <floater.string name="linksets_fetching_error">Error detected while querying for pathfinding linksets</floater.string>
-  <floater.string name="linksets_none_found">No pathfinding linksets</floater.string>
-  <floater.string name="linksets_available">[NUM_SELECTED] linksets selected out of [NUM_TOTAL]</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>
-- 
cgit v1.2.3


From c0c642862e8e4b58e185aafdd29460c7a89c6483 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 11 Jan 2012 17:44:49 -0800
Subject: PATH-145: Implementing the basics of filtering on the pathfinding
 linksets console.  Still need some refinments in usability.

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

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

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 2ae2795cb5..f4631c865a 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -62,7 +62,7 @@
       left_delta="93"
       top="11"
       max_length_bytes="10"
-      name="estate"
+      name="filter_by_name"
       width="115" />
   <text
       height="13"
@@ -87,7 +87,7 @@
       left_delta="131"
       top="11"
       max_length_bytes="10"
-      name="estate"
+      name="filter_by_description"
       width="115" />
   <check_box
       height="19"
@@ -95,7 +95,7 @@
       layout="topleft"
       left="591"
       top="14"
-      name="DisplayNavmeshOverlay"
+      name="filter_by_fixed"
       width="90" />
   <check_box
       height="19"
@@ -103,14 +103,14 @@
       layout="topleft"
       left="671"
       top="14"
-      name="DisplayNavmeshOverlay"
+      name="filter_by_walkable"
       width="90" />
   <button
       follows="right|top"
       height="21"
       label="Apply"
       layout="topleft"
-      name="linksets"
+      name="apply_filters"
       top="11"
       left="769"
       width="73"/>
@@ -119,7 +119,7 @@
       height="21"
       label="Clear"
       layout="topleft"
-      name="linksets"
+      name="clear_filters"
       top="11"
       left="851"
       width="73"/>
-- 
cgit v1.2.3


From fa03d3ee3d9bcf213754250a8180a65156bffe8d Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 13 Jan 2012 17:16:43 -0800
Subject: PATH-186: Starting to build some baseline UI functionality to support
 the editing of linnkset fields.

---
 .../default/xui/en/floater_pathfinding_linksets.xml      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

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 f4631c865a..21711880af 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -246,14 +246,14 @@
       height="19"
       label="Fixed"
       layout="topleft"
-      name="DisplayNavmeshOverlay"
+      name="edit_fixed_value"
       top_pad="10"
       width="90" />
   <check_box
       height="19"
       label="Walkable"
       layout="topleft"
-      name="DisplayNavmeshOverlay"
+      name="edit_walkable_value"
       top_pad="5"
       left="38"
       width="90" />
@@ -292,7 +292,7 @@
       layout="topleft"
       left_delta="14"
       max_length_bytes="10"
-      name="estate"
+      name="edit_a_value"
       width="45" />
   <text
       height="13"
@@ -316,7 +316,7 @@
       layout="topleft"
       left_delta="14"
       max_length_bytes="10"
-      name="estate"
+      name="edit_b_value"
       width="45" />
   <text
       height="13"
@@ -340,7 +340,7 @@
       layout="topleft"
       left_delta="14"
       max_length_bytes="10"
-      name="estate"
+      name="edit_c_value"
       width="45" />
   <text
       height="13"
@@ -364,13 +364,13 @@
       layout="topleft"
       left_delta="14"
       max_length_bytes="10"
-      name="estate"
+      name="edit_d_value"
       width="45" />
   <check_box
       height="19"
       label="Phantom"
       layout="topleft"
-      name="DisplayNavmeshOverlay"
+      name="edit_phantom_value"
       top="271"
       left="559"
       width="90" />
@@ -379,7 +379,7 @@
       height="21"
       label="Apply changes"
       layout="topleft"
-      name="linksets"
+      name="apply_edit_values"
       top="270"
       left="735"
       width="134"/>
-- 
cgit v1.2.3


From 7e213192a2b799e0b3d8590bbc5c81c80a2ee0fa Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 17 Jan 2012 17:31:46 -0800
Subject: PATH-186: Enabling and disabling the edit fields based on whether
 linksets are selected.

---
 .../skins/default/xui/en/floater_pathfinding_linksets.xml      | 10 ++++++++++
 1 file changed, 10 insertions(+)

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

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 21711880af..53edf5294c 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -263,6 +263,8 @@
       use_ellipses="false"
       type="string"
       text_color="LabelTextColor"
+      text_readonly_color="LabelDisabledColor"
+      name="walkability_coefficients_label"
       length="1"
       follows="left|top"
       layout="topleft"
@@ -277,6 +279,8 @@
       use_ellipses="false"
       type="string"
       text_color="LabelTextColor"
+      text_readonly_color="LabelDisabledColor"
+      name="edit_a_label"
       length="1"
       follows="left|top"
       layout="topleft"
@@ -300,6 +304,8 @@
       use_ellipses="false"
       type="string"
       text_color="LabelTextColor"
+      text_readonly_color="LabelDisabledColor"
+      name="edit_b_label"
       length="1"
       follows="left|top"
       layout="topleft"
@@ -324,6 +330,8 @@
       use_ellipses="false"
       type="string"
       text_color="LabelTextColor"
+      text_readonly_color="LabelDisabledColor"
+      name="edit_c_label"
       length="1"
       follows="left|top"
       layout="topleft"
@@ -348,6 +356,8 @@
       use_ellipses="false"
       type="string"
       text_color="LabelTextColor"
+      text_readonly_color="LabelDisabledColor"
+      name="edit_d_label"
       length="1"
       follows="left|top"
       layout="topleft"
-- 
cgit v1.2.3


From 47c9b857980d6bc32b03e2757c9d9fb689805b86 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 18 Jan 2012 16:17:40 -0800
Subject: PATH-186: Changing the base type for internal storage of the
 walkability coefficients to be S32 instead of F32 to avoid precision errors
 in comparing values when determining which values need to be updated through
 the PUT service.

---
 .../newview/skins/default/xui/en/floater_pathfinding_linksets.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

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 53edf5294c..6f14315ead 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -295,7 +295,7 @@
       height="20"
       layout="topleft"
       left_delta="14"
-      max_length_bytes="10"
+      max_length_chars="3"
       name="edit_a_value"
       width="45" />
   <text
@@ -321,7 +321,7 @@
       height="20"
       layout="topleft"
       left_delta="14"
-      max_length_bytes="10"
+      max_length_chars="3"
       name="edit_b_value"
       width="45" />
   <text
@@ -347,7 +347,7 @@
       height="20"
       layout="topleft"
       left_delta="14"
-      max_length_bytes="10"
+      max_length_chars="3"
       name="edit_c_value"
       width="45" />
   <text
@@ -373,7 +373,7 @@
       height="20"
       layout="topleft"
       left_delta="14"
-      max_length_bytes="10"
+      max_length_chars="3"
       name="edit_d_value"
       width="45" />
   <check_box
-- 
cgit v1.2.3


From 53175f835ea0170a38ccaa49397eb09d26a52984 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 19 Jan 2012 17:51:46 -0800
Subject: PATH-225: Adding ability to filter and edit linksets using the
 pathing state values of walkable, obstacle, or ignored.

---
 .../xui/en/floater_pathfinding_linksets.xml        | 88 ++++++++++++++--------
 1 file changed, 56 insertions(+), 32 deletions(-)

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

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 6f14315ead..a808a1f08f 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -36,8 +36,8 @@
       layout="topleft"
       left="20"
       top="16"
-      width="90">
-    Filter list by:
+      width="67">
+    Filter by:
   </text>
   <text
       height="13"
@@ -48,10 +48,10 @@
       length="1"
       follows="left|top"
       layout="topleft"
-      left="109"
+      left="87"
       top="16"
-      width="94">
-    Portion of name
+      width="62">
+    Name
   </text>
   <line_editor
       border_style="line"
@@ -59,11 +59,11 @@
       follows="top|left"
       height="20"
       layout="topleft"
-      left_delta="93"
+      left_delta="62"
       top="11"
       max_length_bytes="10"
       name="filter_by_name"
-      width="115" />
+      width="105" />
   <text
       height="13"
       word_wrap="false"
@@ -73,10 +73,10 @@
       length="1"
       follows="left|top"
       layout="topleft"
-      left="336"
+      left="273"
       top="16"
-      width="132">
-    Portion of description
+      width="88">
+    Description
   </text>
   <line_editor
       border_style="line"
@@ -84,26 +84,37 @@
       follows="top|left"
       height="20"
       layout="topleft"
-      left_delta="131"
+      left_delta="88"
       top="11"
       max_length_bytes="10"
       name="filter_by_description"
-      width="115" />
+      width="106" />
   <check_box
       height="19"
-      label="Fixed"
+      initial_value="1"
+      label="Walkable"
       layout="topleft"
-      left="591"
+      left="481"
       top="14"
-      name="filter_by_fixed"
+      name="filter_by_walkable"
       width="90" />
   <check_box
       height="19"
-      label="Walkable"
+      initial_value="1"
+      label="Obstacle"
       layout="topleft"
-      left="671"
+      left="577"
       top="14"
-      name="filter_by_walkable"
+      name="filter_by_obstacle"
+      width="90" />
+  <check_box
+      height="19"
+      initial_value="1"
+      label="Ignored"
+      layout="topleft"
+      left="674"
+      top="14"
+      name="filter_by_ignored"
       width="90" />
   <button
       follows="right|top"
@@ -242,21 +253,34 @@
       width="910">
     Select row(s) to edit attributes of linkset(s).  If a linkset is deleted or returned to inventory, attributes assigned to it will be lost.
   </text>
-  <check_box
-      height="19"
-      label="Fixed"
-      layout="topleft"
-      name="edit_fixed_value"
-      top_pad="10"
-      width="90" />
-  <check_box
-      height="19"
-      label="Walkable"
+  <radio_group
+      follows="top|left"
+      height="55"
+      value="1"
       layout="topleft"
-      name="edit_walkable_value"
-      top_pad="5"
-      left="38"
-      width="90" />
+      left_delta="0"
+      name="edit_path_state"
+      top_delta="21"
+      width="138">
+    <radio_item
+        label="Walkable"
+        layout="topleft"
+        height="13"
+        name="edit_pathing_state_walkable"
+        value="1"/>
+    <radio_item
+        label="Obstacle"
+        layout="topleft"
+        height="13"
+        name="edit_pathing_state_obstacle"
+        value="2"/>
+    <radio_item
+        label="Ignored"
+        layout="topleft"
+        height="13"
+        name="edit_pathing_state_ignored"
+        value="3"/>
+  </radio_group>
   <text
       height="13"
       word_wrap="false"
-- 
cgit v1.2.3


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/default/xui/en')

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


From 33be67dd99e35e787d57e4b5959c4558ce4db67d Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 20 Jan 2012 11:03:16 -0800
Subject: PATH-225 Updating the linksets list table layout for more regular
 spacing.

---
 .../skins/default/xui/en/floater_pathfinding_linksets.xml      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

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 d33df8fbb8..81d9376fee 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -147,23 +147,23 @@
     <scroll_list.columns
         label="Name (root prim)"
         name="name"
-        width="152" />
+        width="173" />
     <scroll_list.columns
         label="Description (root prim)"
         name="description"
-        width="191" />
+        width="212" />
     <scroll_list.columns
         label="Land impact"
         name="land_impact"
-        width="85" />
+        width="95" />
     <scroll_list.columns
         label="Dist from you"
         name="dist_from_you"
-        width="87" />
+        width="97" />
     <scroll_list.columns
         label="State"
         name="path_state"
-        width="136" />
+        width="74" />
     <scroll_list.columns
         label="Phantom"
         name="is_phantom"
-- 
cgit v1.2.3


From dd7cb6392683f4dfa536ef72e13919a082157a04 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 20 Jan 2012 17:12:24 -0800
Subject: PATH-187: Starting to refactor the capability service for
 querying/editing linksets.

---
 .../default/xui/en/floater_pathfinding_linksets.xml  | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

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

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 81d9376fee..e5d06481e5 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -11,14 +11,18 @@
     single_instance="true"
     title="Pathfinding linksets"
     width="950">
-  <floater.string name="linksets_fetching_initial"></floater.string>
-  <floater.string name="linksets_fetching_starting">Building query for pathfinding linksets ...</floater.string>
-  <floater.string name="linksets_fetching_inprogress">Querying for pathfinding linksets ...</floater.string>
-  <floater.string name="linksets_fetching_inprogress_multi_request">Querying for pathfinding linksets (already in progress) ...</floater.string>
-  <floater.string name="linksets_fetching_received">Loading pathfinding linksets data from response ...</floater.string>
-  <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="linksets_messaging_initial"></floater.string>
+  <floater.string name="linksets_messaging_fetch_starting">Building query for pathfinding linksets ...</floater.string>
+  <floater.string name="linksets_messaging_fetch_inprogress">Querying for pathfinding linksets ...</floater.string>
+  <floater.string name="linksets_messaging_fetch_inprogress_multi_request">Querying for pathfinding linksets (already in progress) ...</floater.string>
+  <floater.string name="linksets_messaging_fetch_received">Loading pathfinding linksets data from response ...</floater.string>
+  <floater.string name="linksets_messaging_fetch_error">Error detected while querying for pathfinding linksets</floater.string>
+  <floater.string name="linksets_messaging_modify_starting">Building modify message for selected pathfinding linksets ...</floater.string>
+  <floater.string name="linksets_messaging_modify_inprogress">Modifying selected pathfinding linksets ...</floater.string>
+  <floater.string name="linksets_messaging_modify_received">Loading modified pathfinding linksets data from response ...</floater.string>
+  <floater.string name="linksets_messaging_modify_error">Error detected while modifying for pathfinding linksets</floater.string>
+  <floater.string name="linksets_messaging_complete_none_found">No pathfinding linksets</floater.string>
+  <floater.string name="linksets_messaging_complete_available">[NUM_SELECTED] linksets selected out of [NUM_TOTAL]</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>
-- 
cgit v1.2.3


From 455899b242478518b181f94823332235950270dd Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 23 Jan 2012 17:36:22 -0800
Subject: Adding some initial reporting on the pathfinding console detailing
 the state of the navmesh download.

---
 .../newview/skins/default/xui/en/floater_pathfinding_console.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 5716ec30b7..f9730e2ece 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -11,6 +11,11 @@
     single_instance="true"
     title="Pathfinding"
     width="833">
+  <floater.string name="navmesh_fetch_initial"></floater.string>
+  <floater.string name="navmesh_fetch_inprogress">Downloading the navmesh ...</floater.string>
+  <floater.string name="navmesh_fetch_complete">Navmesh received.</floater.string>
+  <floater.string name="navmesh_region_not_enabled">Pathfinding is not enabled for this region</floater.string>
+  <floater.string name="navmesh_library_not_implemented">Cannot find pathing library implementation</floater.string>
   <text
       height="13"
       word_wrap="true"
@@ -240,14 +245,14 @@ to see the path between them.
       word_wrap="true"
       use_ellipses="false"
       type="string"
-      text_color="DrYellow"
+      text_color="LabelTextColor"
       length="1"
       follows="left|top"
       layout="topleft"
       left="240"
+      name="pathfinding_status"
       top_pad="10"
       width="208">
-    Result: No path found.
   </text>
   <view_border
       bevel_style="none"
-- 
cgit v1.2.3


From 3b4d841ee254186d881490cfadbdfbac6dcdf6ad Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 23 Jan 2012 18:27:10 -0800
Subject: Introducing a hacky way to get some reporting on the downloading
 status of the navmesh into the console.  This needs to be seriously
 refactored.

---
 indra/newview/skins/default/xui/en/floater_pathfinding_console.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index f9730e2ece..7b751d525f 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -13,9 +13,10 @@
     width="833">
   <floater.string name="navmesh_fetch_initial"></floater.string>
   <floater.string name="navmesh_fetch_inprogress">Downloading the navmesh ...</floater.string>
-  <floater.string name="navmesh_fetch_complete">Navmesh received.</floater.string>
-  <floater.string name="navmesh_region_not_enabled">Pathfinding is not enabled for this region</floater.string>
-  <floater.string name="navmesh_library_not_implemented">Cannot find pathing library implementation</floater.string>
+  <floater.string name="navmesh_fetch_complete_available">Navmesh received.</floater.string>
+  <floater.string name="navmesh_fetch_complete_none">No navmesh for region.</floater.string>
+  <floater.string name="navmesh_region_not_enabled">Pathfinding is not enabled for this region.</floater.string>
+  <floater.string name="navmesh_library_not_implemented">Cannot find pathing library implementation.</floater.string>
   <text
       height="13"
       word_wrap="true"
-- 
cgit v1.2.3


From 00c64bf14db9440fcd5eae8a6b7595dfc11d0bfe Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 31 Jan 2012 16:35:51 -0800
Subject: PATH-235: Correcting a warning message about the
 floater_pathfinding_console.xml containing invalid parameters.

---
 indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

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 e5d06481e5..65c0bf3cca 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -94,7 +94,7 @@
       width="106" />
   <check_box
       height="19"
-      initial_value="1"
+      initial_value="true"
       label="Walkable"
       layout="topleft"
       left="481"
@@ -103,7 +103,7 @@
       width="90" />
   <check_box
       height="19"
-      initial_value="1"
+      initial_value="true"
       label="Obstacle"
       layout="topleft"
       left="577"
@@ -112,7 +112,7 @@
       width="90" />
   <check_box
       height="19"
-      initial_value="1"
+      initial_value="true"
       label="Ignored"
       layout="topleft"
       left="674"
-- 
cgit v1.2.3


From 2beb9c1903bc4164fe9e57c4a2eb1cc42d413ef4 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 1 Feb 2012 17:40:16 -0800
Subject: PATH-198: Laid out the pathfinding buttons per Leo's design. 
 Functionality is currently hooked up to stubs that report a warning message
 about lack of implementation.

---
 .../newview/skins/default/xui/en/floater_tools.xml | 40 ++++++++++++++++++++++
 1 file changed, 40 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index f9147ea650..b8ed10b339 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2401,6 +2401,46 @@ even though the user gets a free copy.
              name="Physics Restitution"
              top_pad="8"
              width="132" />
+          <text
+           type="string"
+           length="1"
+           follows="left|top"
+           height="10"
+           layout="topleft"
+           left_delta="0"
+           top_delta="45"
+           name="pathfinding_type_label"
+           width="121">
+            Pathfinding Type:
+          </text>
+          <radio_group
+            follows="top|left"
+            height="55"
+            layout="topleft"
+            name="edit_pathfinding_state"
+            left_delta="0"
+            top_delta="15"
+            value="1"
+            width="75">
+            <radio_item
+                label="Walkable"
+                layout="topleft"
+                height="13"
+                name="edit_pathfinding_state_walkable"
+                value="1"/>
+            <radio_item
+                label="Obstacle"
+                layout="topleft"
+                height="13"
+                name="edit_pathfinding_state_obstacle"
+                value="2"/>
+            <radio_item
+                label="Ignored"
+                layout="topleft"
+                height="13"
+                name="edit_pathfinding_state_ignored"
+                value="3"/>
+          </radio_group>
         </panel>
          <panel
          border="false"
-- 
cgit v1.2.3


From beadc65fe4dd40a01069eb3d29659d1b06f6d746 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 1 Feb 2012 18:14:04 -0800
Subject: Renaming the XUI files for the pathfinding console to setup.

---
 .../default/xui/en/floater_pathfinding_console.xml | 466 ---------------------
 .../default/xui/en/floater_pathfinding_setup.xml   | 466 +++++++++++++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |   2 +-
 3 files changed, 467 insertions(+), 467 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
 create mode 100644 indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
deleted file mode 100644
index 7b751d525f..0000000000
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ /dev/null
@@ -1,466 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-    open_positioning="cascading"
-    can_tear_off="false"
-    height="228"
-    layout="topleft"
-    name="floater_pathfinding"
-    help_topic="floater_pathfinding"
-    reuse_instance="true"
-    save_rect="true"
-    single_instance="true"
-    title="Pathfinding"
-    width="833">
-  <floater.string name="navmesh_fetch_initial"></floater.string>
-  <floater.string name="navmesh_fetch_inprogress">Downloading the navmesh ...</floater.string>
-  <floater.string name="navmesh_fetch_complete_available">Navmesh received.</floater.string>
-  <floater.string name="navmesh_fetch_complete_none">No navmesh for region.</floater.string>
-  <floater.string name="navmesh_region_not_enabled">Pathfinding is not enabled for this region.</floater.string>
-  <floater.string name="navmesh_library_not_implemented">Cannot find pathing library implementation.</floater.string>
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="12"
-      top="20"
-      width="208">
-    Show overlays:
-  </text>
-  <check_box
-      height="19"
-      label="Navmesh"
-      layout="topleft"
-      left="20"
-      name="show_navmesh_overlay"
-      top_pad="5"
-      width="90" />
-  <check_box
-      height="19"
-      label="Exclusion volumes"
-      layout="topleft"
-      left="20"
-      name="show_exclusion_volumes"
-      top_pad="0"
-      width="90" />
-  <check_box
-      height="19"
-      label="Path"
-      layout="topleft"
-      left="20"
-      name="show_path"
-      top_pad="0"
-      width="90" />
-  <check_box
-      height="19"
-      label="Water plane"
-      layout="topleft"
-      left="20"
-      name="show_water_plane"
-      top_pad="0"
-      width="90" />
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      layout="topleft"
-      left="12"
-      top_pad="10"
-      width="208">
-    Overlay on:
-  </text>
-  <radio_group
-      follows="top|left"
-      height="45"
-      value="1"
-      layout="topleft"
-      left_delta="8"
-      name="region_overlay_display"
-      top_delta="17"
-      width="200">
-    <radio_item
-        label="Fixed physics geometry"
-        layout="topleft"
-        height="14"
-        name="display_overlay_on_fixed"
-        value="1"/>
-    <radio_item
-        label="All renderable geometry"
-        layout="topleft"
-        height="14"
-        name="display_overlay_on_all"
-        value="2"/>
-  </radio_group>
-  <view_border
-      bevel_style="none"
-      follows="top|left"
-      height="203"
-      layout="topleft"
-      name="horiz_separator_1"
-      top="15"
-      left="228"
-      width="0"/>
-  <text
-      height="24"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      line_spacing.pixels="2"
-      follows="left|top"
-      layout="topleft"
-      left="240"
-      top="18"
-      width="208">
-Click on two points
-to see the path between them.
-  </text>
-  <radio_group
-      allow_deselect="true"
-      follows="top|left"
-      height="45"
-      layout="topleft"
-      left_delta="0"
-      name="path_selection"
-      top_delta="33"
-      value="0"
-      width="200">
-    <radio_item
-        label="Choose start point"
-        layout="topleft"
-        height="14"
-        name="choose_path_start_point"
-        value="1"/>
-    <radio_item
-        label="Choose end point"
-        layout="topleft"
-        height="14"
-        name="choose_path_end_point"
-        value="2"/>
-  </radio_group>
-  <text
-      height="14"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="240"
-      width="208">
-    Character width
-  </text>
-  <slider
-      decimal_digits="1"
-      height="14"
-      increment="0.1"
-      layout="topleft"
-      max_val="2"
-      min_val="0.2"
-      name="character_width"
-      top_pad="7"
-      value="1"
-      width="145" />
-  <text
-      height="14"
-      word_wrap="false"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      top_pad="-14"
-      left="382"
-      width="208">
-    m
-  </text>
-  <text
-      height="14"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="240"
-      top_pad="10"
-      width="208">
-    Character type
-  </text>
-  <radio_group
-      follows="top|left"
-      height="20"
-      layout="topleft"
-      left_delta="0"
-      name="character_type"
-      top_delta="20"
-      value="1"
-      width="200">
-    <radio_item
-        label="A"
-        height="14"
-        width="30"
-	value="1"
-        name="character_type_a"/>
-    <radio_item
-        label="B"
-        height="14"
-        width="30"
-        layout="topleft"
-        top="4"
-        left="50"
-	value="2"
-        name="character_type_b"/>
-    <radio_item
-        label="C"
-        height="14"
-        width="30"
-        layout="topleft"
-        top="4"
-        left="100"
-	value="3"
-        name="character_type_c"/>
-    <radio_item
-        label="D"
-        height="14"
-        width="30"
-        layout="topleft"
-        top="4"
-        left="150"
-	value="4"
-        name="character_type_d"/>
-  </radio_group>
-  <text
-      height="14"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="240"
-      name="pathfinding_status"
-      top_pad="10"
-      width="208">
-  </text>
-  <view_border
-      bevel_style="none"
-      follows="top|left"
-      height="203"
-      layout="topleft"
-      name="horiz_separator_2"
-      top="15"
-      left="456"
-      width="0"/>
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="470"
-      top="18"
-      width="180">
-    View / edit linkset attributes:
-  </text>
-  <button
-      follows="left|top"
-      height="21"
-      label="Linksets..."
-      layout="topleft"
-      name="view_and_edit_linksets"
-      width="96"/>
-  <text
-      height="25"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      line_spacing.pixels="4"
-      follows="left|top"
-      layout="topleft"
-      top_pad="22"
-      width="180">
-If you have made changes
-to objects or terrain:
-  </text>
-  <button
-      follows="left|top"
-      height="22"
-      label="Rebuild navmesh"
-      layout="topleft"
-      name="rebuild_navmesh"
-      top_pad="14"
-      width="149"/>
-  <text
-      height="25"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      line_spacing.pixels="4"
-      follows="left|top"
-      layout="topleft"
-      top_pad="14"
-      width="180">
-To load the current state
-of the mesh:
-  </text>
-  <button
-      follows="left|top"
-      height="21"
-      label="Refresh"
-      layout="topleft"
-      name="refresh_navmesh"
-      top_pad="9"
-      width="95"/>
-  <view_border
-      bevel_style="none"
-      follows="top|left"
-      height="203"
-      layout="topleft"
-      name="horiz_separator_3"
-      top="15"
-      left="667"
-      width="0"/>
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="689"
-      top="18"
-      width="208">
-    Terrain materials
-  </text>
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      top_pad="17"
-      width="208">
-    A
-  </text>
-  <line_editor
-      border_style="line"
-      border_thickness="1"
-      follows="top|left"
-      height="21"
-      layout="topleft"
-      left_delta="22"
-      max_length_bytes="10"
-      name="terrain_material_a"
-      width="46" />
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      layout="topleft"
-      left_pad="-68"
-      top_pad="17"
-      width="208">
-    B
-  </text>
-  <line_editor
-      border_style="line"
-      border_thickness="1"
-      follows="top|left"
-      height="21"
-      layout="topleft"
-      left_delta="22"
-      max_length_bytes="10"
-      name="terrain_material_b"
-      width="46" />
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      layout="topleft"
-      left_pad="-68"
-      top_pad="17"
-      width="208">
-    C
-  </text>
-  <line_editor
-      border_style="line"
-      border_thickness="1"
-      follows="top|left"
-      height="21"
-      layout="topleft"
-      left_delta="22"
-      max_length_bytes="10"
-      name="terrain_material_c"
-      width="46" />
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      layout="topleft"
-      left_pad="-68"
-      top_pad="17"
-      width="208">
-    D
-  </text>
-  <line_editor
-      border_style="line"
-      border_thickness="1"
-      follows="top|left"
-      height="21"
-      layout="topleft"
-      left_delta="22"
-      max_length_bytes="10"
-      name="terrain_material_d"
-      width="46" />
-  <text
-      height="38"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      line_spacing.pixels="4"
-      follows="left|top"
-      layout="topleft"
-      left_pad="-68"
-      top_pad="14"
-      width="180">
-Rebuild the navmesh
-after making any
-changes.
-  </text>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml
new file mode 100644
index 0000000000..7b751d525f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml
@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+    open_positioning="cascading"
+    can_tear_off="false"
+    height="228"
+    layout="topleft"
+    name="floater_pathfinding"
+    help_topic="floater_pathfinding"
+    reuse_instance="true"
+    save_rect="true"
+    single_instance="true"
+    title="Pathfinding"
+    width="833">
+  <floater.string name="navmesh_fetch_initial"></floater.string>
+  <floater.string name="navmesh_fetch_inprogress">Downloading the navmesh ...</floater.string>
+  <floater.string name="navmesh_fetch_complete_available">Navmesh received.</floater.string>
+  <floater.string name="navmesh_fetch_complete_none">No navmesh for region.</floater.string>
+  <floater.string name="navmesh_region_not_enabled">Pathfinding is not enabled for this region.</floater.string>
+  <floater.string name="navmesh_library_not_implemented">Cannot find pathing library implementation.</floater.string>
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="12"
+      top="20"
+      width="208">
+    Show overlays:
+  </text>
+  <check_box
+      height="19"
+      label="Navmesh"
+      layout="topleft"
+      left="20"
+      name="show_navmesh_overlay"
+      top_pad="5"
+      width="90" />
+  <check_box
+      height="19"
+      label="Exclusion volumes"
+      layout="topleft"
+      left="20"
+      name="show_exclusion_volumes"
+      top_pad="0"
+      width="90" />
+  <check_box
+      height="19"
+      label="Path"
+      layout="topleft"
+      left="20"
+      name="show_path"
+      top_pad="0"
+      width="90" />
+  <check_box
+      height="19"
+      label="Water plane"
+      layout="topleft"
+      left="20"
+      name="show_water_plane"
+      top_pad="0"
+      width="90" />
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      layout="topleft"
+      left="12"
+      top_pad="10"
+      width="208">
+    Overlay on:
+  </text>
+  <radio_group
+      follows="top|left"
+      height="45"
+      value="1"
+      layout="topleft"
+      left_delta="8"
+      name="region_overlay_display"
+      top_delta="17"
+      width="200">
+    <radio_item
+        label="Fixed physics geometry"
+        layout="topleft"
+        height="14"
+        name="display_overlay_on_fixed"
+        value="1"/>
+    <radio_item
+        label="All renderable geometry"
+        layout="topleft"
+        height="14"
+        name="display_overlay_on_all"
+        value="2"/>
+  </radio_group>
+  <view_border
+      bevel_style="none"
+      follows="top|left"
+      height="203"
+      layout="topleft"
+      name="horiz_separator_1"
+      top="15"
+      left="228"
+      width="0"/>
+  <text
+      height="24"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      line_spacing.pixels="2"
+      follows="left|top"
+      layout="topleft"
+      left="240"
+      top="18"
+      width="208">
+Click on two points
+to see the path between them.
+  </text>
+  <radio_group
+      allow_deselect="true"
+      follows="top|left"
+      height="45"
+      layout="topleft"
+      left_delta="0"
+      name="path_selection"
+      top_delta="33"
+      value="0"
+      width="200">
+    <radio_item
+        label="Choose start point"
+        layout="topleft"
+        height="14"
+        name="choose_path_start_point"
+        value="1"/>
+    <radio_item
+        label="Choose end point"
+        layout="topleft"
+        height="14"
+        name="choose_path_end_point"
+        value="2"/>
+  </radio_group>
+  <text
+      height="14"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="240"
+      width="208">
+    Character width
+  </text>
+  <slider
+      decimal_digits="1"
+      height="14"
+      increment="0.1"
+      layout="topleft"
+      max_val="2"
+      min_val="0.2"
+      name="character_width"
+      top_pad="7"
+      value="1"
+      width="145" />
+  <text
+      height="14"
+      word_wrap="false"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      top_pad="-14"
+      left="382"
+      width="208">
+    m
+  </text>
+  <text
+      height="14"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="240"
+      top_pad="10"
+      width="208">
+    Character type
+  </text>
+  <radio_group
+      follows="top|left"
+      height="20"
+      layout="topleft"
+      left_delta="0"
+      name="character_type"
+      top_delta="20"
+      value="1"
+      width="200">
+    <radio_item
+        label="A"
+        height="14"
+        width="30"
+	value="1"
+        name="character_type_a"/>
+    <radio_item
+        label="B"
+        height="14"
+        width="30"
+        layout="topleft"
+        top="4"
+        left="50"
+	value="2"
+        name="character_type_b"/>
+    <radio_item
+        label="C"
+        height="14"
+        width="30"
+        layout="topleft"
+        top="4"
+        left="100"
+	value="3"
+        name="character_type_c"/>
+    <radio_item
+        label="D"
+        height="14"
+        width="30"
+        layout="topleft"
+        top="4"
+        left="150"
+	value="4"
+        name="character_type_d"/>
+  </radio_group>
+  <text
+      height="14"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="240"
+      name="pathfinding_status"
+      top_pad="10"
+      width="208">
+  </text>
+  <view_border
+      bevel_style="none"
+      follows="top|left"
+      height="203"
+      layout="topleft"
+      name="horiz_separator_2"
+      top="15"
+      left="456"
+      width="0"/>
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="470"
+      top="18"
+      width="180">
+    View / edit linkset attributes:
+  </text>
+  <button
+      follows="left|top"
+      height="21"
+      label="Linksets..."
+      layout="topleft"
+      name="view_and_edit_linksets"
+      width="96"/>
+  <text
+      height="25"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      line_spacing.pixels="4"
+      follows="left|top"
+      layout="topleft"
+      top_pad="22"
+      width="180">
+If you have made changes
+to objects or terrain:
+  </text>
+  <button
+      follows="left|top"
+      height="22"
+      label="Rebuild navmesh"
+      layout="topleft"
+      name="rebuild_navmesh"
+      top_pad="14"
+      width="149"/>
+  <text
+      height="25"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      line_spacing.pixels="4"
+      follows="left|top"
+      layout="topleft"
+      top_pad="14"
+      width="180">
+To load the current state
+of the mesh:
+  </text>
+  <button
+      follows="left|top"
+      height="21"
+      label="Refresh"
+      layout="topleft"
+      name="refresh_navmesh"
+      top_pad="9"
+      width="95"/>
+  <view_border
+      bevel_style="none"
+      follows="top|left"
+      height="203"
+      layout="topleft"
+      name="horiz_separator_3"
+      top="15"
+      left="667"
+      width="0"/>
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="689"
+      top="18"
+      width="208">
+    Terrain materials
+  </text>
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      top_pad="17"
+      width="208">
+    A
+  </text>
+  <line_editor
+      border_style="line"
+      border_thickness="1"
+      follows="top|left"
+      height="21"
+      layout="topleft"
+      left_delta="22"
+      max_length_bytes="10"
+      name="terrain_material_a"
+      width="46" />
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      layout="topleft"
+      left_pad="-68"
+      top_pad="17"
+      width="208">
+    B
+  </text>
+  <line_editor
+      border_style="line"
+      border_thickness="1"
+      follows="top|left"
+      height="21"
+      layout="topleft"
+      left_delta="22"
+      max_length_bytes="10"
+      name="terrain_material_b"
+      width="46" />
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      layout="topleft"
+      left_pad="-68"
+      top_pad="17"
+      width="208">
+    C
+  </text>
+  <line_editor
+      border_style="line"
+      border_thickness="1"
+      follows="top|left"
+      height="21"
+      layout="topleft"
+      left_delta="22"
+      max_length_bytes="10"
+      name="terrain_material_c"
+      width="46" />
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      layout="topleft"
+      left_pad="-68"
+      top_pad="17"
+      width="208">
+    D
+  </text>
+  <line_editor
+      border_style="line"
+      border_thickness="1"
+      follows="top|left"
+      height="21"
+      layout="topleft"
+      left_delta="22"
+      max_length_bytes="10"
+      name="terrain_material_d"
+      width="46" />
+  <text
+      height="38"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      line_spacing.pixels="4"
+      follows="left|top"
+      layout="topleft"
+      left_pad="-68"
+      top_pad="14"
+      width="180">
+Rebuild the navmesh
+after making any
+changes.
+  </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 54477f2cb7..967ea598b8 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -943,7 +943,7 @@
             name="pathfinding_menu_item">
             <menu_item_call.on_click
                 function="Floater.ToggleOrBringToFront"
-                parameter="pathfinding_console" />
+                parameter="pathfinding_setup" />
         </menu_item_call>
 
         <menu_item_separator/>
-- 
cgit v1.2.3


From 1892c968cb9a74def955d532d6fbe9028ee13eaf Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 1 Feb 2012 18:29:11 -0800
Subject: Updating build menu with the new Pathfinding menu that opens into a
 sub-menu with three choices.

---
 .../default/xui/en/floater_pathfinding_setup.xml   |  2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml | 34 ++++++++++++++++++----
 2 files changed, 29 insertions(+), 7 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml
index 7b751d525f..37555eea3a 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml
@@ -9,7 +9,7 @@
     reuse_instance="true"
     save_rect="true"
     single_instance="true"
-    title="Pathfinding"
+    title="Pathfinding setup"
     width="833">
   <floater.string name="navmesh_fetch_initial"></floater.string>
   <floater.string name="navmesh_fetch_inprogress">Downloading the navmesh ...</floater.string>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 967ea598b8..f952fc3266 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -938,15 +938,37 @@
           </menu_item_call>
         </menu>
 
+      <menu
+         create_jump_keys="true"
+         label="Pathfinding"
+         name="Pathfindubg"
+         tear_off="false">
         <menu_item_call
-            label="Pathfinding..."
-            name="pathfinding_menu_item">
-            <menu_item_call.on_click
-                function="Floater.ToggleOrBringToFront"
-                parameter="pathfinding_setup" />
+            label="Setup..."
+            name="pathfinding_setup_menu_item">
+          <menu_item_call.on_click
+              function="Floater.ToggleOrBringToFront"
+              parameter="pathfinding_setup" />
+        </menu_item_call>
+        <menu_item_call
+            label="Linksets..."
+            name="pathfinding_linksets_menu_item">
+          <menu_item_call.on_click
+              function="Floater.ToggleOrBringToFront"
+              parameter="pathfinding_linksets" />
         </menu_item_call>
+        <menu_item_call
+            label="Characters..."
+            enabled="false"
+            name="pathfinding_characters_menu_item">
+          <menu_item_call.on_click
+              function="Floater.ToggleOrBringToFront"
+              parameter="pathfinding_linksets" />
+        </menu_item_call>
+      </menu>
 
-        <menu_item_separator/>
+
+      <menu_item_separator/>
 
         <menu
          create_jump_keys="true"
-- 
cgit v1.2.3


From 525343b9e5f39dafafe2a16e8173ad7f69acb0d6 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 2 Feb 2012 18:30:35 -0800
Subject: PATH-245: First pass at laying out the characters floater. 
 Functionality is mostly stubbed in.  The data is currently tied to the same
 cap service as the linkset data, so that will need to change as soon as the
 new service is available.

---
 .../xui/en/floater_pathfinding_characters.xml      | 173 +++++++++++++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |   3 +-
 indra/newview/skins/default/xui/en/strings.xml     |   2 +
 3 files changed, 176 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
new file mode 100644
index 0000000000..9ae28d6a15
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+    open_positioning="cascading"
+    can_tear_off="false"
+    height="273"
+    layout="topleft"
+    name="floater_pathfinding_characters"
+    help_topic="floater_pathfinding_characters"
+    reuse_instance="true"
+    save_rect="true"
+    single_instance="true"
+    title="Pathfinding characters"
+    width="635">
+  <floater.string name="characters_messaging_initial"></floater.string>
+  <floater.string name="characters_messaging_fetch_starting">Building query for pathfinding characters ...</floater.string>
+  <floater.string name="characters_messaging_fetch_inprogress">Querying for pathfinding characters ...</floater.string>
+  <floater.string name="characters_messaging_fetch_inprogress_multi_request">Querying for pathfinding characters (already in progress) ...</floater.string>
+  <floater.string name="characters_messaging_fetch_received">Loading pathfinding characters data from response ...</floater.string>
+  <floater.string name="characters_messaging_fetch_error">Error detected while querying for pathfinding characters</floater.string>
+  <floater.string name="characters_messaging_complete_none_found">No pathfinding characters</floater.string>
+  <floater.string name="characters_messaging_complete_available">[NUM_SELECTED] characters selected out of [NUM_TOTAL]</floater.string>
+  <scroll_list
+      column_padding="0"
+      draw_heading="true"
+      follows="all"
+      height="135"
+      layout="topleft"
+      left="18"
+      top="10"
+      multi_select="true"
+      name="pathfinding_characters"
+      width="600">
+    <scroll_list.columns
+        label="Name"
+        name="name"
+        width="137" />
+    <scroll_list.columns
+        label="Description"
+        name="description"
+        width="172" />
+    <scroll_list.columns
+        label="Owner"
+        name="owner"
+        width="141" />
+    <scroll_list.columns
+        label="CPU"
+        name="cpu_time"
+        width="60" />
+    <scroll_list.columns
+        label="Altitude"
+        name="altitude"
+        width="64" />
+  </scroll_list>
+  <text
+      height="13"
+      word_wrap="false"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      name="characters_status"
+      top="161"
+      width="500">
+    Characters:
+  </text>
+  <button
+      follows="right|top"
+      height="21"
+      label="Refresh list"
+      layout="topleft"
+      name="refresh_characters_list"
+      top="161"
+      left="257"
+      width="115"/>
+  <button
+      follows="right|top"
+      height="21"
+      label="Select all"
+      layout="topleft"
+      name="select_all_characters"
+      top="161"
+      left="378"
+      width="115"/>
+  <button
+      follows="right|top"
+      height="21"
+      label="Select none"
+      layout="topleft"
+      name="select_none_characters"
+      top="161"
+      left="502"
+      width="115"/>
+  <view_border
+      bevel_style="none"
+      follows="top|left"
+      height="0"
+      layout="topleft"
+      name="horiz_separator"
+      top="196"
+      left="20"
+      width="600"/>
+  <text
+      height="13"
+      word_wrap="false"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      text_readonly_color="LabelDisabledColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      name="actions_label"
+      top_pad="12"
+      width="910">
+    Actions on selected characters:
+  </text>
+  <check_box
+      height="19"
+      label="Show beacon"
+      layout="topleft"
+      name="show_beacon"
+      top="208"
+      left="259"
+      width="90" />
+  <button
+      follows="right|top"
+      height="22"
+      label="Take"
+      layout="topleft"
+      name="take_characters"
+      top="232"
+      left="17"
+      width="94"/>
+  <button
+      follows="right|top"
+      height="22"
+      label="Take copy"
+      layout="topleft"
+      name="take_copy_characters"
+      top="232"
+      left="119"
+      width="94"/>
+  <button
+      follows="right|top"
+      height="22"
+      label="Return"
+      layout="topleft"
+      name="return_characters"
+      top="233"
+      left="220"
+      width="94"/>
+  <button
+      follows="right|top"
+      height="22"
+      label="Delete"
+      layout="topleft"
+      name="delete_characters"
+      top="233"
+      left="322"
+      width="94"/>
+  <button
+      follows="right|top"
+      height="22"
+      label="Teleport me to it"
+      layout="topleft"
+      name="teleport_to_character"
+      tool_tip="Enabled only when one character is selected."
+      top="233"
+      left="420"
+      width="159"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index f952fc3266..33a756fdd5 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -959,11 +959,10 @@
         </menu_item_call>
         <menu_item_call
             label="Characters..."
-            enabled="false"
             name="pathfinding_characters_menu_item">
           <menu_item_call.on_click
               function="Floater.ToggleOrBringToFront"
-              parameter="pathfinding_linksets" />
+              parameter="pathfinding_characters" />
         </menu_item_call>
       </menu>
 
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index d2ccf7a396..793893f540 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3696,6 +3696,7 @@ Try enclosing path to the editor with double quotes.
   <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>
@@ -3724,6 +3725,7 @@ Try enclosing path to the editor with double quotes.
   <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>
-- 
cgit v1.2.3


From 750c6f5acd1d25e16f2f0692dd6d06d20813dcf5 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 6 Feb 2012 17:54:00 -0800
Subject: Making the linksets floater scale properly.

---
 .../xui/en/floater_pathfinding_linksets.xml        | 53 ++++++++++++----------
 1 file changed, 30 insertions(+), 23 deletions(-)

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

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 65c0bf3cca..9aea89ece7 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
     open_positioning="cascading"
+    can_resize="true"
     can_tear_off="false"
     height="330"
+    width="950"
+    min_height="330"
+    min_width="950"
     layout="topleft"
     name="floater_pathfinding_linksets"
     help_topic="floater_pathfinding_linksets"
     reuse_instance="true"
-    save_rect="true"
+    save_rect="false"
     single_instance="true"
-    title="Pathfinding linksets"
-    width="950">
+    title="Pathfinding linksets">
   <floater.string name="linksets_messaging_initial"></floater.string>
   <floater.string name="linksets_messaging_fetch_starting">Building query for pathfinding linksets ...</floater.string>
   <floater.string name="linksets_messaging_fetch_inprogress">Querying for pathfinding linksets ...</floater.string>
@@ -59,7 +62,7 @@
   <line_editor
       border_style="line"
       border_thickness="1"
-      follows="top|left"
+      follows="left|top"
       height="20"
       layout="topleft"
       left_delta="62"
@@ -84,7 +87,7 @@
   <line_editor
       border_style="line"
       border_thickness="1"
-      follows="top|left"
+      follows="left|top"
       height="20"
       layout="topleft"
       left_delta="88"
@@ -94,6 +97,7 @@
       width="106" />
   <check_box
       height="19"
+      follows="left|top"
       initial_value="true"
       label="Walkable"
       layout="topleft"
@@ -103,6 +107,7 @@
       width="90" />
   <check_box
       height="19"
+      follows="left|top"
       initial_value="true"
       label="Obstacle"
       layout="topleft"
@@ -112,6 +117,7 @@
       width="90" />
   <check_box
       height="19"
+      follows="left|top"
       initial_value="true"
       label="Ignored"
       layout="topleft"
@@ -151,7 +157,7 @@
     <scroll_list.columns
         label="Name (root prim)"
         name="name"
-        width="173" />
+        dynamic_width="true" />
     <scroll_list.columns
         label="Description (root prim)"
         name="description"
@@ -196,7 +202,7 @@
       type="string"
       text_color="LabelTextColor"
       length="1"
-      follows="left|top"
+      follows="left|bottom"
       layout="topleft"
       name="linksets_status"
       top="200"
@@ -204,7 +210,7 @@
     Linksets:
   </text>
   <button
-      follows="right|top"
+      follows="right|bottom"
       height="21"
       label="Refresh list"
       layout="topleft"
@@ -213,7 +219,7 @@
       left="568"
       width="115"/>
   <button
-      follows="right|top"
+      follows="right|bottom"
       height="21"
       label="Select all"
       layout="topleft"
@@ -222,7 +228,7 @@
       left="690"
       width="115"/>
   <button
-      follows="right|top"
+      follows="right|bottom"
       height="21"
       label="Select none"
       layout="topleft"
@@ -232,7 +238,7 @@
       width="115"/>
   <view_border
       bevel_style="none"
-      follows="top|left"
+      follows="left|bottom|right"
       height="0"
       layout="topleft"
       name="horiz_separator"
@@ -246,14 +252,14 @@
       type="string"
       text_color="LabelTextColor"
       length="1"
-      follows="left|top"
+      follows="left|bottom"
       layout="topleft"
       top_pad="12"
       width="910">
     Select row(s) to edit attributes of linkset(s).  If a linkset is deleted or returned to inventory, attributes assigned to it will be lost.
   </text>
   <radio_group
-      follows="top|left"
+      follows="left|bottom"
       height="55"
       value="1"
       layout="topleft"
@@ -289,7 +295,7 @@
       text_readonly_color="LabelDisabledColor"
       name="walkability_coefficients_label"
       length="1"
-      follows="left|top"
+      follows="left|bottom"
       layout="topleft"
       left="159"
       top="271"
@@ -305,7 +311,7 @@
       text_readonly_color="LabelDisabledColor"
       name="edit_a_label"
       length="1"
-      follows="left|top"
+      follows="left|bottom"
       layout="topleft"
       top_pad="12"
       width="90">
@@ -314,7 +320,7 @@
   <line_editor
       border_style="line"
       border_thickness="1"
-      follows="top|left"
+      follows="left|bottom"
       height="20"
       layout="topleft"
       left_delta="14"
@@ -330,7 +336,7 @@
       text_readonly_color="LabelDisabledColor"
       name="edit_b_label"
       length="1"
-      follows="left|top"
+      follows="left|bottom"
       layout="topleft"
       left="248"
       top_pad="-13"
@@ -340,7 +346,7 @@
   <line_editor
       border_style="line"
       border_thickness="1"
-      follows="top|left"
+      follows="left|bottom"
       height="20"
       layout="topleft"
       left_delta="14"
@@ -356,7 +362,7 @@
       text_readonly_color="LabelDisabledColor"
       name="edit_c_label"
       length="1"
-      follows="left|top"
+      follows="left|bottom"
       layout="topleft"
       left="337"
       top_pad="-13"
@@ -366,7 +372,7 @@
   <line_editor
       border_style="line"
       border_thickness="1"
-      follows="top|left"
+      follows="left|bottom"
       height="20"
       layout="topleft"
       left_delta="14"
@@ -382,7 +388,7 @@
       text_readonly_color="LabelDisabledColor"
       name="edit_d_label"
       length="1"
-      follows="left|top"
+      follows="left|bottom"
       layout="topleft"
       left="426"
       top_pad="-13"
@@ -392,7 +398,7 @@
   <line_editor
       border_style="line"
       border_thickness="1"
-      follows="top|left"
+      follows="left|bottom"
       height="20"
       layout="topleft"
       left_delta="14"
@@ -400,6 +406,7 @@
       name="edit_d_value"
       width="45" />
   <check_box
+      follows="left|bottom"
       height="19"
       label="Phantom"
       layout="topleft"
@@ -408,7 +415,7 @@
       left="559"
       width="90" />
   <button
-      follows="right|top"
+      follows="right|bottom"
       height="21"
       label="Apply changes"
       layout="topleft"
-- 
cgit v1.2.3


From fa46459cdb6d63fea6a76d8c11eee5503edf5bb1 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 7 Feb 2012 14:13:57 -0800
Subject: PATH-245: Hooking the characters floater up to the character service.
  Also, adding in an additional state to handle the floater when the service
 does not exist.

---
 .../skins/default/xui/en/floater_pathfinding_characters.xml      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
index 9ae28d6a15..5938342556 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -19,6 +19,7 @@
   <floater.string name="characters_messaging_fetch_error">Error detected while querying for pathfinding characters</floater.string>
   <floater.string name="characters_messaging_complete_none_found">No pathfinding characters</floater.string>
   <floater.string name="characters_messaging_complete_available">[NUM_SELECTED] characters selected out of [NUM_TOTAL]</floater.string>
+  <floater.string name="characters_messaging_service_not_available">Required capability is not available in current region</floater.string>
   <scroll_list
       column_padding="0"
       draw_heading="true"
@@ -52,8 +53,8 @@
         width="64" />
   </scroll_list>
   <text
-      height="13"
-      word_wrap="false"
+      height="26"
+      word_wrap="true"
       use_ellipses="false"
       type="string"
       text_color="LabelTextColor"
@@ -62,7 +63,7 @@
       layout="topleft"
       name="characters_status"
       top="161"
-      width="500">
+      width="240">
     Characters:
   </text>
   <button
@@ -113,7 +114,7 @@
       layout="topleft"
       name="actions_label"
       top_pad="12"
-      width="910">
+      width="242">
     Actions on selected characters:
   </text>
   <check_box
-- 
cgit v1.2.3


From 90c174d87667b2fc106d8d88a063f9ecf8aaff8d Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 7 Feb 2012 14:25:59 -0800
Subject: Adding functionality to better handle the cause where the capability
 service does not exist to the linksets floater.

---
 indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml | 1 +
 1 file changed, 1 insertion(+)

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

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 9aea89ece7..ec720b55ca 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -26,6 +26,7 @@
   <floater.string name="linksets_messaging_modify_error">Error detected while modifying for pathfinding linksets</floater.string>
   <floater.string name="linksets_messaging_complete_none_found">No pathfinding linksets</floater.string>
   <floater.string name="linksets_messaging_complete_available">[NUM_SELECTED] linksets selected out of [NUM_TOTAL]</floater.string>
+  <floater.string name="linksets_messaging_service_not_available">Required capability is not available in current region</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>
-- 
cgit v1.2.3


From 706627e38a9bdc2fda00d4a9624c922a1f9dddb7 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 7 Feb 2012 17:22:54 -0800
Subject: PATH-245: Ensuring that the characters floater is scalable.

---
 .../xui/en/floater_pathfinding_characters.xml      | 34 ++++++++++++----------
 1 file changed, 19 insertions(+), 15 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
index 5938342556..8cd220553f 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
     open_positioning="cascading"
+    can_resize="true"
     can_tear_off="false"
     height="273"
+    width="635"
+    min_height="273"
+    min_width="635"
     layout="topleft"
     name="floater_pathfinding_characters"
     help_topic="floater_pathfinding_characters"
     reuse_instance="true"
-    save_rect="true"
+    save_rect="false"
     single_instance="true"
-    title="Pathfinding characters"
-    width="635">
+    title="Pathfinding characters">
   <floater.string name="characters_messaging_initial"></floater.string>
   <floater.string name="characters_messaging_fetch_starting">Building query for pathfinding characters ...</floater.string>
   <floater.string name="characters_messaging_fetch_inprogress">Querying for pathfinding characters ...</floater.string>
@@ -34,7 +37,7 @@
     <scroll_list.columns
         label="Name"
         name="name"
-        width="137" />
+        dynamic_width="true" />
     <scroll_list.columns
         label="Description"
         name="description"
@@ -59,7 +62,7 @@
       type="string"
       text_color="LabelTextColor"
       length="1"
-      follows="left|top"
+      follows="left|bottom"
       layout="topleft"
       name="characters_status"
       top="161"
@@ -67,7 +70,7 @@
     Characters:
   </text>
   <button
-      follows="right|top"
+      follows="right|bottom"
       height="21"
       label="Refresh list"
       layout="topleft"
@@ -76,7 +79,7 @@
       left="257"
       width="115"/>
   <button
-      follows="right|top"
+      follows="right|bottom"
       height="21"
       label="Select all"
       layout="topleft"
@@ -85,7 +88,7 @@
       left="378"
       width="115"/>
   <button
-      follows="right|top"
+      follows="right|bottom"
       height="21"
       label="Select none"
       layout="topleft"
@@ -95,7 +98,7 @@
       width="115"/>
   <view_border
       bevel_style="none"
-      follows="top|left"
+      follows="left|right|bottom"
       height="0"
       layout="topleft"
       name="horiz_separator"
@@ -110,7 +113,7 @@
       text_color="LabelTextColor"
       text_readonly_color="LabelDisabledColor"
       length="1"
-      follows="left|top"
+      follows="left|bottom"
       layout="topleft"
       name="actions_label"
       top_pad="12"
@@ -119,6 +122,7 @@
   </text>
   <check_box
       height="19"
+      follows="left|bottom"
       label="Show beacon"
       layout="topleft"
       name="show_beacon"
@@ -126,7 +130,7 @@
       left="259"
       width="90" />
   <button
-      follows="right|top"
+      follows="left|bottom"
       height="22"
       label="Take"
       layout="topleft"
@@ -135,7 +139,7 @@
       left="17"
       width="94"/>
   <button
-      follows="right|top"
+      follows="left|bottom"
       height="22"
       label="Take copy"
       layout="topleft"
@@ -144,7 +148,7 @@
       left="119"
       width="94"/>
   <button
-      follows="right|top"
+      follows="left|bottom"
       height="22"
       label="Return"
       layout="topleft"
@@ -153,7 +157,7 @@
       left="220"
       width="94"/>
   <button
-      follows="right|top"
+      follows="left|bottom"
       height="22"
       label="Delete"
       layout="topleft"
@@ -162,7 +166,7 @@
       left="322"
       width="94"/>
   <button
-      follows="right|top"
+      follows="left|bottom"
       height="22"
       label="Teleport me to it"
       layout="topleft"
-- 
cgit v1.2.3


From 11259b37ee93e06fd61dac8e88180150c1fd63b8 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 10 Feb 2012 17:34:14 -0800
Subject: PATH-284: Moving files around in preparation for the new pathfinding
 console design.

---
 .../default/xui/en/floater_pathfinding_console.xml | 466 +++++++++++++++++++++
 .../default/xui/en/floater_pathfinding_setup.xml   | 466 ---------------------
 2 files changed, 466 insertions(+), 466 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
 delete mode 100644 indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
new file mode 100644
index 0000000000..37555eea3a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+    open_positioning="cascading"
+    can_tear_off="false"
+    height="228"
+    layout="topleft"
+    name="floater_pathfinding"
+    help_topic="floater_pathfinding"
+    reuse_instance="true"
+    save_rect="true"
+    single_instance="true"
+    title="Pathfinding setup"
+    width="833">
+  <floater.string name="navmesh_fetch_initial"></floater.string>
+  <floater.string name="navmesh_fetch_inprogress">Downloading the navmesh ...</floater.string>
+  <floater.string name="navmesh_fetch_complete_available">Navmesh received.</floater.string>
+  <floater.string name="navmesh_fetch_complete_none">No navmesh for region.</floater.string>
+  <floater.string name="navmesh_region_not_enabled">Pathfinding is not enabled for this region.</floater.string>
+  <floater.string name="navmesh_library_not_implemented">Cannot find pathing library implementation.</floater.string>
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="12"
+      top="20"
+      width="208">
+    Show overlays:
+  </text>
+  <check_box
+      height="19"
+      label="Navmesh"
+      layout="topleft"
+      left="20"
+      name="show_navmesh_overlay"
+      top_pad="5"
+      width="90" />
+  <check_box
+      height="19"
+      label="Exclusion volumes"
+      layout="topleft"
+      left="20"
+      name="show_exclusion_volumes"
+      top_pad="0"
+      width="90" />
+  <check_box
+      height="19"
+      label="Path"
+      layout="topleft"
+      left="20"
+      name="show_path"
+      top_pad="0"
+      width="90" />
+  <check_box
+      height="19"
+      label="Water plane"
+      layout="topleft"
+      left="20"
+      name="show_water_plane"
+      top_pad="0"
+      width="90" />
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      layout="topleft"
+      left="12"
+      top_pad="10"
+      width="208">
+    Overlay on:
+  </text>
+  <radio_group
+      follows="top|left"
+      height="45"
+      value="1"
+      layout="topleft"
+      left_delta="8"
+      name="region_overlay_display"
+      top_delta="17"
+      width="200">
+    <radio_item
+        label="Fixed physics geometry"
+        layout="topleft"
+        height="14"
+        name="display_overlay_on_fixed"
+        value="1"/>
+    <radio_item
+        label="All renderable geometry"
+        layout="topleft"
+        height="14"
+        name="display_overlay_on_all"
+        value="2"/>
+  </radio_group>
+  <view_border
+      bevel_style="none"
+      follows="top|left"
+      height="203"
+      layout="topleft"
+      name="horiz_separator_1"
+      top="15"
+      left="228"
+      width="0"/>
+  <text
+      height="24"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      line_spacing.pixels="2"
+      follows="left|top"
+      layout="topleft"
+      left="240"
+      top="18"
+      width="208">
+Click on two points
+to see the path between them.
+  </text>
+  <radio_group
+      allow_deselect="true"
+      follows="top|left"
+      height="45"
+      layout="topleft"
+      left_delta="0"
+      name="path_selection"
+      top_delta="33"
+      value="0"
+      width="200">
+    <radio_item
+        label="Choose start point"
+        layout="topleft"
+        height="14"
+        name="choose_path_start_point"
+        value="1"/>
+    <radio_item
+        label="Choose end point"
+        layout="topleft"
+        height="14"
+        name="choose_path_end_point"
+        value="2"/>
+  </radio_group>
+  <text
+      height="14"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="240"
+      width="208">
+    Character width
+  </text>
+  <slider
+      decimal_digits="1"
+      height="14"
+      increment="0.1"
+      layout="topleft"
+      max_val="2"
+      min_val="0.2"
+      name="character_width"
+      top_pad="7"
+      value="1"
+      width="145" />
+  <text
+      height="14"
+      word_wrap="false"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      top_pad="-14"
+      left="382"
+      width="208">
+    m
+  </text>
+  <text
+      height="14"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="240"
+      top_pad="10"
+      width="208">
+    Character type
+  </text>
+  <radio_group
+      follows="top|left"
+      height="20"
+      layout="topleft"
+      left_delta="0"
+      name="character_type"
+      top_delta="20"
+      value="1"
+      width="200">
+    <radio_item
+        label="A"
+        height="14"
+        width="30"
+	value="1"
+        name="character_type_a"/>
+    <radio_item
+        label="B"
+        height="14"
+        width="30"
+        layout="topleft"
+        top="4"
+        left="50"
+	value="2"
+        name="character_type_b"/>
+    <radio_item
+        label="C"
+        height="14"
+        width="30"
+        layout="topleft"
+        top="4"
+        left="100"
+	value="3"
+        name="character_type_c"/>
+    <radio_item
+        label="D"
+        height="14"
+        width="30"
+        layout="topleft"
+        top="4"
+        left="150"
+	value="4"
+        name="character_type_d"/>
+  </radio_group>
+  <text
+      height="14"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="240"
+      name="pathfinding_status"
+      top_pad="10"
+      width="208">
+  </text>
+  <view_border
+      bevel_style="none"
+      follows="top|left"
+      height="203"
+      layout="topleft"
+      name="horiz_separator_2"
+      top="15"
+      left="456"
+      width="0"/>
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="470"
+      top="18"
+      width="180">
+    View / edit linkset attributes:
+  </text>
+  <button
+      follows="left|top"
+      height="21"
+      label="Linksets..."
+      layout="topleft"
+      name="view_and_edit_linksets"
+      width="96"/>
+  <text
+      height="25"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      line_spacing.pixels="4"
+      follows="left|top"
+      layout="topleft"
+      top_pad="22"
+      width="180">
+If you have made changes
+to objects or terrain:
+  </text>
+  <button
+      follows="left|top"
+      height="22"
+      label="Rebuild navmesh"
+      layout="topleft"
+      name="rebuild_navmesh"
+      top_pad="14"
+      width="149"/>
+  <text
+      height="25"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      line_spacing.pixels="4"
+      follows="left|top"
+      layout="topleft"
+      top_pad="14"
+      width="180">
+To load the current state
+of the mesh:
+  </text>
+  <button
+      follows="left|top"
+      height="21"
+      label="Refresh"
+      layout="topleft"
+      name="refresh_navmesh"
+      top_pad="9"
+      width="95"/>
+  <view_border
+      bevel_style="none"
+      follows="top|left"
+      height="203"
+      layout="topleft"
+      name="horiz_separator_3"
+      top="15"
+      left="667"
+      width="0"/>
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="689"
+      top="18"
+      width="208">
+    Terrain materials
+  </text>
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      top_pad="17"
+      width="208">
+    A
+  </text>
+  <line_editor
+      border_style="line"
+      border_thickness="1"
+      follows="top|left"
+      height="21"
+      layout="topleft"
+      left_delta="22"
+      max_length_bytes="10"
+      name="terrain_material_a"
+      width="46" />
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      layout="topleft"
+      left_pad="-68"
+      top_pad="17"
+      width="208">
+    B
+  </text>
+  <line_editor
+      border_style="line"
+      border_thickness="1"
+      follows="top|left"
+      height="21"
+      layout="topleft"
+      left_delta="22"
+      max_length_bytes="10"
+      name="terrain_material_b"
+      width="46" />
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      layout="topleft"
+      left_pad="-68"
+      top_pad="17"
+      width="208">
+    C
+  </text>
+  <line_editor
+      border_style="line"
+      border_thickness="1"
+      follows="top|left"
+      height="21"
+      layout="topleft"
+      left_delta="22"
+      max_length_bytes="10"
+      name="terrain_material_c"
+      width="46" />
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      layout="topleft"
+      left_pad="-68"
+      top_pad="17"
+      width="208">
+    D
+  </text>
+  <line_editor
+      border_style="line"
+      border_thickness="1"
+      follows="top|left"
+      height="21"
+      layout="topleft"
+      left_delta="22"
+      max_length_bytes="10"
+      name="terrain_material_d"
+      width="46" />
+  <text
+      height="38"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      line_spacing.pixels="4"
+      follows="left|top"
+      layout="topleft"
+      left_pad="-68"
+      top_pad="14"
+      width="180">
+Rebuild the navmesh
+after making any
+changes.
+  </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml
deleted file mode 100644
index 37555eea3a..0000000000
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_setup.xml
+++ /dev/null
@@ -1,466 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-    open_positioning="cascading"
-    can_tear_off="false"
-    height="228"
-    layout="topleft"
-    name="floater_pathfinding"
-    help_topic="floater_pathfinding"
-    reuse_instance="true"
-    save_rect="true"
-    single_instance="true"
-    title="Pathfinding setup"
-    width="833">
-  <floater.string name="navmesh_fetch_initial"></floater.string>
-  <floater.string name="navmesh_fetch_inprogress">Downloading the navmesh ...</floater.string>
-  <floater.string name="navmesh_fetch_complete_available">Navmesh received.</floater.string>
-  <floater.string name="navmesh_fetch_complete_none">No navmesh for region.</floater.string>
-  <floater.string name="navmesh_region_not_enabled">Pathfinding is not enabled for this region.</floater.string>
-  <floater.string name="navmesh_library_not_implemented">Cannot find pathing library implementation.</floater.string>
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="12"
-      top="20"
-      width="208">
-    Show overlays:
-  </text>
-  <check_box
-      height="19"
-      label="Navmesh"
-      layout="topleft"
-      left="20"
-      name="show_navmesh_overlay"
-      top_pad="5"
-      width="90" />
-  <check_box
-      height="19"
-      label="Exclusion volumes"
-      layout="topleft"
-      left="20"
-      name="show_exclusion_volumes"
-      top_pad="0"
-      width="90" />
-  <check_box
-      height="19"
-      label="Path"
-      layout="topleft"
-      left="20"
-      name="show_path"
-      top_pad="0"
-      width="90" />
-  <check_box
-      height="19"
-      label="Water plane"
-      layout="topleft"
-      left="20"
-      name="show_water_plane"
-      top_pad="0"
-      width="90" />
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      layout="topleft"
-      left="12"
-      top_pad="10"
-      width="208">
-    Overlay on:
-  </text>
-  <radio_group
-      follows="top|left"
-      height="45"
-      value="1"
-      layout="topleft"
-      left_delta="8"
-      name="region_overlay_display"
-      top_delta="17"
-      width="200">
-    <radio_item
-        label="Fixed physics geometry"
-        layout="topleft"
-        height="14"
-        name="display_overlay_on_fixed"
-        value="1"/>
-    <radio_item
-        label="All renderable geometry"
-        layout="topleft"
-        height="14"
-        name="display_overlay_on_all"
-        value="2"/>
-  </radio_group>
-  <view_border
-      bevel_style="none"
-      follows="top|left"
-      height="203"
-      layout="topleft"
-      name="horiz_separator_1"
-      top="15"
-      left="228"
-      width="0"/>
-  <text
-      height="24"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      line_spacing.pixels="2"
-      follows="left|top"
-      layout="topleft"
-      left="240"
-      top="18"
-      width="208">
-Click on two points
-to see the path between them.
-  </text>
-  <radio_group
-      allow_deselect="true"
-      follows="top|left"
-      height="45"
-      layout="topleft"
-      left_delta="0"
-      name="path_selection"
-      top_delta="33"
-      value="0"
-      width="200">
-    <radio_item
-        label="Choose start point"
-        layout="topleft"
-        height="14"
-        name="choose_path_start_point"
-        value="1"/>
-    <radio_item
-        label="Choose end point"
-        layout="topleft"
-        height="14"
-        name="choose_path_end_point"
-        value="2"/>
-  </radio_group>
-  <text
-      height="14"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="240"
-      width="208">
-    Character width
-  </text>
-  <slider
-      decimal_digits="1"
-      height="14"
-      increment="0.1"
-      layout="topleft"
-      max_val="2"
-      min_val="0.2"
-      name="character_width"
-      top_pad="7"
-      value="1"
-      width="145" />
-  <text
-      height="14"
-      word_wrap="false"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      top_pad="-14"
-      left="382"
-      width="208">
-    m
-  </text>
-  <text
-      height="14"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="240"
-      top_pad="10"
-      width="208">
-    Character type
-  </text>
-  <radio_group
-      follows="top|left"
-      height="20"
-      layout="topleft"
-      left_delta="0"
-      name="character_type"
-      top_delta="20"
-      value="1"
-      width="200">
-    <radio_item
-        label="A"
-        height="14"
-        width="30"
-	value="1"
-        name="character_type_a"/>
-    <radio_item
-        label="B"
-        height="14"
-        width="30"
-        layout="topleft"
-        top="4"
-        left="50"
-	value="2"
-        name="character_type_b"/>
-    <radio_item
-        label="C"
-        height="14"
-        width="30"
-        layout="topleft"
-        top="4"
-        left="100"
-	value="3"
-        name="character_type_c"/>
-    <radio_item
-        label="D"
-        height="14"
-        width="30"
-        layout="topleft"
-        top="4"
-        left="150"
-	value="4"
-        name="character_type_d"/>
-  </radio_group>
-  <text
-      height="14"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="240"
-      name="pathfinding_status"
-      top_pad="10"
-      width="208">
-  </text>
-  <view_border
-      bevel_style="none"
-      follows="top|left"
-      height="203"
-      layout="topleft"
-      name="horiz_separator_2"
-      top="15"
-      left="456"
-      width="0"/>
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="470"
-      top="18"
-      width="180">
-    View / edit linkset attributes:
-  </text>
-  <button
-      follows="left|top"
-      height="21"
-      label="Linksets..."
-      layout="topleft"
-      name="view_and_edit_linksets"
-      width="96"/>
-  <text
-      height="25"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      line_spacing.pixels="4"
-      follows="left|top"
-      layout="topleft"
-      top_pad="22"
-      width="180">
-If you have made changes
-to objects or terrain:
-  </text>
-  <button
-      follows="left|top"
-      height="22"
-      label="Rebuild navmesh"
-      layout="topleft"
-      name="rebuild_navmesh"
-      top_pad="14"
-      width="149"/>
-  <text
-      height="25"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      line_spacing.pixels="4"
-      follows="left|top"
-      layout="topleft"
-      top_pad="14"
-      width="180">
-To load the current state
-of the mesh:
-  </text>
-  <button
-      follows="left|top"
-      height="21"
-      label="Refresh"
-      layout="topleft"
-      name="refresh_navmesh"
-      top_pad="9"
-      width="95"/>
-  <view_border
-      bevel_style="none"
-      follows="top|left"
-      height="203"
-      layout="topleft"
-      name="horiz_separator_3"
-      top="15"
-      left="667"
-      width="0"/>
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="689"
-      top="18"
-      width="208">
-    Terrain materials
-  </text>
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      top_pad="17"
-      width="208">
-    A
-  </text>
-  <line_editor
-      border_style="line"
-      border_thickness="1"
-      follows="top|left"
-      height="21"
-      layout="topleft"
-      left_delta="22"
-      max_length_bytes="10"
-      name="terrain_material_a"
-      width="46" />
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      layout="topleft"
-      left_pad="-68"
-      top_pad="17"
-      width="208">
-    B
-  </text>
-  <line_editor
-      border_style="line"
-      border_thickness="1"
-      follows="top|left"
-      height="21"
-      layout="topleft"
-      left_delta="22"
-      max_length_bytes="10"
-      name="terrain_material_b"
-      width="46" />
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      layout="topleft"
-      left_pad="-68"
-      top_pad="17"
-      width="208">
-    C
-  </text>
-  <line_editor
-      border_style="line"
-      border_thickness="1"
-      follows="top|left"
-      height="21"
-      layout="topleft"
-      left_delta="22"
-      max_length_bytes="10"
-      name="terrain_material_c"
-      width="46" />
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      layout="topleft"
-      left_pad="-68"
-      top_pad="17"
-      width="208">
-    D
-  </text>
-  <line_editor
-      border_style="line"
-      border_thickness="1"
-      follows="top|left"
-      height="21"
-      layout="topleft"
-      left_delta="22"
-      max_length_bytes="10"
-      name="terrain_material_d"
-      width="46" />
-  <text
-      height="38"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      line_spacing.pixels="4"
-      follows="left|top"
-      layout="topleft"
-      left_pad="-68"
-      top_pad="14"
-      width="180">
-Rebuild the navmesh
-after making any
-changes.
-  </text>
-</floater>
-- 
cgit v1.2.3


From db977bf85c9e7eb3afc98813dda13107672bb2f6 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 10 Feb 2012 17:49:18 -0800
Subject: PATH-284: Updating the class names in preparation for the new
 pathfinding console design.

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index d8f9453b09..d9a626be14 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -938,10 +938,10 @@
          tear_off="false">
         <menu_item_call
             label="Setup..."
-            name="pathfinding_setup_menu_item">
+            name="pathfinding_console_menu_item">
           <menu_item_call.on_click
               function="Floater.ToggleOrBringToFront"
-              parameter="pathfinding_setup" />
+              parameter="pathfinding_console" />
         </menu_item_call>
         <menu_item_call
             label="Linksets..."
-- 
cgit v1.2.3


From efdba568f60a8d939fcfd40ee0cf6a8e205a5e0b Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 10 Feb 2012 19:59:03 -0800
Subject: PATH-284: Altering the design toward the new layout.  Starting to
 re-hookup the functionality to the new controls.  NOTE:  This DOES break the
 pathing floater functionality.

---
 .../default/xui/en/floater_pathfinding_console.xml | 708 +++++++++------------
 1 file changed, 310 insertions(+), 398 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 37555eea3a..c0588c9931 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -2,15 +2,15 @@
 <floater
     open_positioning="cascading"
     can_tear_off="false"
-    height="228"
+    height="270"
     layout="topleft"
-    name="floater_pathfinding"
-    help_topic="floater_pathfinding"
+    name="floater_pathfinding_console"
+    help_topic="floater_pathfinding_console"
     reuse_instance="true"
     save_rect="true"
     single_instance="true"
-    title="Pathfinding setup"
-    width="833">
+    title="Pathfinding"
+    width="450">
   <floater.string name="navmesh_fetch_initial"></floater.string>
   <floater.string name="navmesh_fetch_inprogress">Downloading the navmesh ...</floater.string>
   <floater.string name="navmesh_fetch_complete_available">Navmesh received.</floater.string>
@@ -29,438 +29,350 @@
       left="12"
       top="20"
       width="208">
-    Show overlays:
+    Show:
   </text>
   <check_box
       height="19"
       label="Navmesh"
       layout="topleft"
       left="20"
-      name="show_navmesh_overlay"
+      name="show_navmesh"
       top_pad="5"
       width="90" />
   <check_box
       height="19"
-      label="Exclusion volumes"
+      label="Walkables"
       layout="topleft"
       left="20"
-      name="show_exclusion_volumes"
+      name="show_walkables"
       top_pad="0"
       width="90" />
   <check_box
       height="19"
-      label="Path"
+      label="Static obstacles"
       layout="topleft"
       left="20"
-      name="show_path"
+      name="show_static_obstacles"
       top_pad="0"
       width="90" />
   <check_box
       height="19"
-      label="Water plane"
+      label="Material volumes"
       layout="topleft"
       left="20"
-      name="show_water_plane"
+      name="show_material_volumes"
       top_pad="0"
       width="90" />
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
+  <check_box
+      height="19"
+      label="Exclusion volumes"
       layout="topleft"
-      left="12"
-      top_pad="10"
-      width="208">
-    Overlay on:
-  </text>
-  <radio_group
-      follows="top|left"
-      height="45"
-      value="1"
+      left="20"
+      name="show_exclusion_volumes"
+      top_pad="0"
+      width="90" />
+  <check_box
+      height="19"
+      label="World"
       layout="topleft"
-      left_delta="8"
-      name="region_overlay_display"
-      top_delta="17"
-      width="200">
-    <radio_item
-        label="Fixed physics geometry"
-        layout="topleft"
-        height="14"
-        name="display_overlay_on_fixed"
-        value="1"/>
-    <radio_item
-        label="All renderable geometry"
-        layout="topleft"
-        height="14"
-        name="display_overlay_on_all"
-        value="2"/>
-  </radio_group>
-  <view_border
+      left="20"
+      name="show_world"
+      top_pad="0"
+      width="90" />
+  <panel
+      border="true"
       bevel_style="none"
-      follows="top|left"
-      height="203"
-      layout="topleft"
-      name="horiz_separator_1"
-      top="15"
-      left="228"
-      width="0"/>
-  <text
-      height="24"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      line_spacing.pixels="2"
-      follows="left|top"
-      layout="topleft"
-      left="240"
-      top="18"
-      width="208">
-Click on two points
-to see the path between them.
-  </text>
-  <radio_group
-      allow_deselect="true"
-      follows="top|left"
-      height="45"
-      layout="topleft"
-      left_delta="0"
-      name="path_selection"
-      top_delta="33"
-      value="0"
-      width="200">
-    <radio_item
-        label="Choose start point"
-        layout="topleft"
-        height="14"
-        name="choose_path_start_point"
-        value="1"/>
-    <radio_item
-        label="Choose end point"
-        layout="topleft"
-        height="14"
-        name="choose_path_end_point"
-        value="2"/>
-  </radio_group>
-  <text
-      height="14"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
       follows="left|top"
       layout="topleft"
-      left="240"
-      width="208">
-    Character width
-  </text>
-  <slider
-      decimal_digits="1"
-      height="14"
-      increment="0.1"
-      layout="topleft"
-      max_val="2"
-      min_val="0.2"
-      name="character_width"
-      top_pad="7"
-      value="1"
-      width="145" />
-  <text
-      height="14"
-      word_wrap="false"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      top_pad="-14"
-      left="382"
-      width="208">
-    m
-  </text>
-  <text
-      height="14"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="240"
-      top_pad="10"
-      width="208">
-    Character type
-  </text>
-  <radio_group
-      follows="top|left"
-      height="20"
-      layout="topleft"
-      left_delta="0"
-      name="character_type"
-      top_delta="20"
-      value="1"
+      height="60"
       width="200">
-    <radio_item
-        label="A"
-        height="14"
-        width="30"
-	value="1"
-        name="character_type_a"/>
-    <radio_item
-        label="B"
-        height="14"
-        width="30"
-        layout="topleft"
-        top="4"
-        left="50"
-	value="2"
-        name="character_type_b"/>
-    <radio_item
-        label="C"
-        height="14"
-        width="30"
+    <text
+        height="13"
+        word_wrap="true"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
         layout="topleft"
-        top="4"
-        left="100"
-	value="3"
-        name="character_type_c"/>
-    <radio_item
-        label="D"
-        height="14"
-        width="30"
+        left="5"
+        top_pad="5"
+        width="190">
+      Status:
+    </text>
+    <text
+        height="28"
+        word_wrap="true"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        follows="left|top"
         layout="topleft"
-        top="4"
-        left="150"
-	value="4"
-        name="character_type_d"/>
-  </radio_group>
-  <text
-      height="14"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="240"
-      name="pathfinding_status"
-      top_pad="10"
-      width="208">
-  </text>
-  <view_border
-      bevel_style="none"
-      follows="top|left"
-      height="203"
-      layout="topleft"
-      name="horiz_separator_2"
-      top="15"
-      left="456"
-      width="0"/>
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="470"
-      top="18"
-      width="180">
-    View / edit linkset attributes:
-  </text>
+        left="15"
+        name="pathfinding_status"
+        top_pad="10"
+        width="180">
+    </text>
+  </panel>
   <button
       follows="left|top"
       height="21"
-      label="Linksets..."
+      left="20"
+      label="Characters..."
       layout="topleft"
-      name="view_and_edit_linksets"
+      name="view_characters_floater"
+      top_pad="10"
       width="96"/>
-  <text
-      height="25"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      line_spacing.pixels="4"
-      follows="left|top"
-      layout="topleft"
-      top_pad="22"
-      width="180">
-If you have made changes
-to objects or terrain:
-  </text>
-  <button
-      follows="left|top"
-      height="22"
-      label="Rebuild navmesh"
-      layout="topleft"
-      name="rebuild_navmesh"
-      top_pad="14"
-      width="149"/>
-  <text
-      height="25"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      line_spacing.pixels="4"
-      follows="left|top"
-      layout="topleft"
-      top_pad="14"
-      width="180">
-To load the current state
-of the mesh:
-  </text>
-  <button
-      follows="left|top"
-      height="21"
-      label="Refresh"
-      layout="topleft"
-      name="refresh_navmesh"
-      top_pad="9"
-      width="95"/>
-  <view_border
-      bevel_style="none"
-      follows="top|left"
-      height="203"
-      layout="topleft"
-      name="horiz_separator_3"
-      top="15"
-      left="667"
-      width="0"/>
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="689"
-      top="18"
-      width="208">
-    Terrain materials
-  </text>
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      top_pad="17"
-      width="208">
-    A
-  </text>
-  <line_editor
-      border_style="line"
-      border_thickness="1"
-      follows="top|left"
-      height="21"
-      layout="topleft"
-      left_delta="22"
-      max_length_bytes="10"
-      name="terrain_material_a"
-      width="46" />
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      layout="topleft"
-      left_pad="-68"
-      top_pad="17"
-      width="208">
-    B
-  </text>
-  <line_editor
-      border_style="line"
-      border_thickness="1"
-      follows="top|left"
-      height="21"
-      layout="topleft"
-      left_delta="22"
-      max_length_bytes="10"
-      name="terrain_material_b"
-      width="46" />
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      layout="topleft"
-      left_pad="-68"
-      top_pad="17"
-      width="208">
-    C
-  </text>
-  <line_editor
-      border_style="line"
-      border_thickness="1"
-      follows="top|left"
-      height="21"
-      layout="topleft"
-      left_delta="22"
-      max_length_bytes="10"
-      name="terrain_material_c"
-      width="46" />
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      layout="topleft"
-      left_pad="-68"
-      top_pad="17"
-      width="208">
-    D
-  </text>
-  <line_editor
-      border_style="line"
-      border_thickness="1"
-      follows="top|left"
-      height="21"
-      layout="topleft"
-      left_delta="22"
-      max_length_bytes="10"
-      name="terrain_material_d"
-      width="46" />
-  <text
-      height="38"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      line_spacing.pixels="4"
+  <tab_container
       follows="left|top"
       layout="topleft"
-      left_pad="-68"
-      top_pad="14"
-      width="180">
-Rebuild the navmesh
-after making any
-changes.
-  </text>
+      tab_position="top"
+      left="220"
+      top="20"
+      height="230"
+      width="220">
+    <panel
+        border="true"
+        bevel_style="none"
+        follows="left|top"
+        layout="topleft"
+        name="edit_panel"
+        left="1"
+        label="Edit">
+      <text
+          word_wrap="true"
+          use_ellipses="false"
+          type="string"
+          text_color="LabelTextColor"
+          length="1"
+          follows="left|top"
+          layout="topleft"
+          left="20"
+          top_pad="10"
+          height="13"
+          width="180">
+        To blah blah blah:
+      </text>
+      <button
+          follows="left|top"
+          height="21"
+          left="30"
+          enabled="false"
+          label="Unfreeze"
+          layout="topleft"
+          name="enter_unfrozen_mode"
+          top_pad="0"
+          width="96"/>
+      <text
+          word_wrap="true"
+          use_ellipses="false"
+          type="string"
+          text_color="LabelTextColor"
+          length="1"
+          follows="left|top"
+          layout="topleft"
+          left="20"
+          top_pad="10"
+          height="13"
+          width="180">
+        To blah blah blah:
+      </text>
+      <button
+          follows="left|top"
+          height="21"
+          left="30"
+          enabled="false"
+          label="Freeze"
+          layout="topleft"
+          name="enter_frozen_mode"
+          top_pad="0"
+          width="96"/>
+      <text
+          word_wrap="true"
+          use_ellipses="false"
+          type="string"
+          text_color="LabelTextColor"
+          length="1"
+          follows="left|top"
+          layout="topleft"
+          left="20"
+          top_pad="10"
+          height="13"
+          width="180">
+        View / edit linkset attributes:
+      </text>
+      <button
+          follows="left|top"
+          height="21"
+          left="30"
+          label="Linksets..."
+          layout="topleft"
+          name="view_and_edit_linksets"
+          top_pad="0"
+          width="96"/>
+      <button
+          follows="left|top"
+          height="21"
+          label="Clear path"
+          layout="topleft"
+          name="clear_path_on_edit"
+          left="20"
+          top="175"
+          width="96"/>
+    </panel>
+    <panel
+        border="true"
+        bevel_style="none"
+        follows="left|top"
+        layout="topleft"
+        left="1"
+        name="test_panel"
+        label="Test">
+      <text
+          height="14"
+          word_wrap="true"
+          use_ellipses="false"
+          type="string"
+          text_color="LabelTextColor"
+          length="1"
+          follows="left|top"
+          layout="topleft"
+          left="20"
+          width="190">
+        Character width
+      </text>
+      <slider
+          decimal_digits="1"
+          height="14"
+          increment="0.1"
+          layout="topleft"
+          follows="left|top"
+          max_val="2"
+          min_val="0.2"
+          name="character_width"
+          top_pad="5"
+          value="1"
+          width="145" />
+      <text
+          height="14"
+          word_wrap="false"
+          use_ellipses="false"
+          type="string"
+          text_color="LabelTextColor"
+          length="1"
+          follows="left|top"
+          layout="topleft"
+          top_pad="-14"
+          left_pad="0"
+          width="20">
+        m
+      </text>
+      <text
+          height="14"
+          word_wrap="true"
+          use_ellipses="false"
+          type="string"
+          text_color="LabelTextColor"
+          length="1"
+          follows="left|top"
+          layout="topleft"
+          left_pad="-165"
+          top_pad="10"
+          width="190">
+        Character type
+      </text>
+      <radio_group
+          follows="top|left"
+          height="20"
+          layout="topleft"
+          left_delta="0"
+          name="character_type"
+          top_delta="20"
+          value="1"
+          width="190">
+        <radio_item
+            label="A"
+            height="14"
+            width="30"
+            value="1"
+            name="character_type_a"/>
+        <radio_item
+            label="B"
+            height="14"
+            width="30"
+            layout="topleft"
+            top="4"
+            left="50"
+            value="2"
+            name="character_type_b"/>
+        <radio_item
+            label="C"
+            height="14"
+            width="30"
+            layout="topleft"
+            top="4"
+            left="100"
+            value="3"
+            name="character_type_c"/>
+        <radio_item
+            label="D"
+            height="14"
+            width="30"
+            layout="topleft"
+            top="4"
+            left="150"
+            value="4"
+            name="character_type_d"/>
+      </radio_group>
+      <text
+          height="14"
+          word_wrap="true"
+          use_ellipses="false"
+          type="string"
+          text_color="LabelTextColor"
+          length="1"
+          follows="left|top"
+          layout="topleft"
+          left_pad="-190"
+          top_pad="10"
+          width="190">
+        Ctrl-click to select start point.
+      </text>
+      <text
+          height="14"
+          word_wrap="true"
+          use_ellipses="false"
+          type="string"
+          text_color="LabelTextColor"
+          length="1"
+          follows="left|top"
+          layout="topleft"
+          top_pad="5"
+          width="190">
+        Alt-click to select start point.
+      </text>
+      <text
+          height="14"
+          word_wrap="true"
+          use_ellipses="false"
+          type="string"
+          text_color="DrYellow"
+          length="1"
+          follows="left|top"
+          layout="topleft"
+          top_pad="15"
+          width="190">
+        Result: No path found.
+      </text>
+      <button
+          follows="left|top"
+          height="21"
+          label="Clear path"
+          layout="topleft"
+          name="clear_path_on_test"
+          left="20"
+          top="175"
+          width="96"/>
+    </panel>
+  </tab_container>
 </floater>
-- 
cgit v1.2.3


From 33ad069ea6138cb0e161a9131dc076ffa719c871 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 13 Feb 2012 09:52:58 -0800
Subject: PATH-284: Updating the build menu options.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index d9a626be14..47d6f36e1b 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -937,19 +937,12 @@
          name="Pathfindubg"
          tear_off="false">
         <menu_item_call
-            label="Setup..."
+            label="Edit/Test..."
             name="pathfinding_console_menu_item">
           <menu_item_call.on_click
               function="Floater.ToggleOrBringToFront"
               parameter="pathfinding_console" />
         </menu_item_call>
-        <menu_item_call
-            label="Linksets..."
-            name="pathfinding_linksets_menu_item">
-          <menu_item_call.on_click
-              function="Floater.ToggleOrBringToFront"
-              parameter="pathfinding_linksets" />
-        </menu_item_call>
         <menu_item_call
             label="Characters..."
             name="pathfinding_characters_menu_item">
-- 
cgit v1.2.3


From 16fa78b1499b6bb68f5038c124953046af690d6c Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 13 Feb 2012 17:58:19 -0800
Subject: PATH-284: Implementing the functionality for the new path generation
 of the new pathfinding console floater design.

---
 indra/newview/skins/default/xui/en/floater_pathfinding_console.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index c0588c9931..7822d0afcb 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -127,6 +127,7 @@
       follows="left|top"
       layout="topleft"
       tab_position="top"
+      name="edit_test_tab_container"
       left="220"
       top="20"
       height="230"
@@ -349,7 +350,7 @@
           layout="topleft"
           top_pad="5"
           width="190">
-        Alt-click to select start point.
+        Shift-click to select end point.
       </text>
       <text
           height="14"
-- 
cgit v1.2.3


From ec75e317a4375b0dd014f2b4388942995eefc798 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 13 Feb 2012 18:09:07 -0800
Subject: PATH-284: Outlining the tab container with a proper border.

---
 .../default/xui/en/floater_pathfinding_console.xml | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 7822d0afcb..8db42bcff6 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -10,7 +10,7 @@
     save_rect="true"
     single_instance="true"
     title="Pathfinding"
-    width="450">
+    width="465">
   <floater.string name="navmesh_fetch_initial"></floater.string>
   <floater.string name="navmesh_fetch_inprogress">Downloading the navmesh ...</floater.string>
   <floater.string name="navmesh_fetch_complete_available">Navmesh received.</floater.string>
@@ -123,17 +123,26 @@
       name="view_characters_floater"
       top_pad="10"
       width="96"/>
+  <view_border
+      bevel_style="none"
+      follows="top|left"
+      layout="topleft"
+      left="233"
+      top="41"
+      height="208"
+      width="216"
+      visible="true" />
   <tab_container
       follows="left|top"
       layout="topleft"
       tab_position="top"
       name="edit_test_tab_container"
-      left="220"
+      left="230"
       top="20"
       height="230"
       width="220">
     <panel
-        border="true"
+        border="false"
         bevel_style="none"
         follows="left|top"
         layout="topleft"
@@ -211,18 +220,9 @@
           name="view_and_edit_linksets"
           top_pad="0"
           width="96"/>
-      <button
-          follows="left|top"
-          height="21"
-          label="Clear path"
-          layout="topleft"
-          name="clear_path_on_edit"
-          left="20"
-          top="175"
-          width="96"/>
     </panel>
     <panel
-        border="true"
+        border="false"
         bevel_style="none"
         follows="left|top"
         layout="topleft"
@@ -370,7 +370,7 @@
           height="21"
           label="Clear path"
           layout="topleft"
-          name="clear_path_on_test"
+          name="clear_path"
           left="20"
           top="175"
           width="96"/>
-- 
cgit v1.2.3


From 9898f55d1aba4f79cbb0f9a4fb68b63ac0f354b7 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 13 Feb 2012 18:42:33 -0800
Subject: PATH-284: Adding tooltips to inform testers of un-implemented
 functionality.

---
 indra/newview/skins/default/xui/en/floater_pathfinding_console.xml | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 8db42bcff6..1d479d6b24 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -46,6 +46,7 @@
       left="20"
       name="show_walkables"
       top_pad="0"
+      tool_tip="Functionality is not implemented currently."
       width="90" />
   <check_box
       height="19"
@@ -54,6 +55,7 @@
       left="20"
       name="show_static_obstacles"
       top_pad="0"
+      tool_tip="Functionality is not implemented currently."
       width="90" />
   <check_box
       height="19"
@@ -62,6 +64,7 @@
       left="20"
       name="show_material_volumes"
       top_pad="0"
+      tool_tip="Functionality is not implemented currently."
       width="90" />
   <check_box
       height="19"
-- 
cgit v1.2.3


From 69b732185ea7176d6ca0e8c1f239cd6fa0e426c2 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 14 Feb 2012 17:41:35 -0800
Subject: PATH-198: Hooking up the path status indicator to some existing state
 information.

---
 .../newview/skins/default/xui/en/floater_pathfinding_console.xml  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 1d479d6b24..166d0d8143 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -17,6 +17,10 @@
   <floater.string name="navmesh_fetch_complete_none">No navmesh for region.</floater.string>
   <floater.string name="navmesh_region_not_enabled">Pathfinding is not enabled for this region.</floater.string>
   <floater.string name="navmesh_library_not_implemented">Cannot find pathing library implementation.</floater.string>
+  <floater.string name="pathing_choose_start_and_end_points">Please choose start and end points.</floater.string>
+  <floater.string name="pathing_choose_start_point">Please choose start point.</floater.string>
+  <floater.string name="pathing_choose_end_point">Please choose end point.</floater.string>
+  <floater.string name="pathing_path_valid">Path is shown in blue.</floater.string>
   <text
       height="13"
       word_wrap="true"
@@ -360,13 +364,13 @@
           word_wrap="true"
           use_ellipses="false"
           type="string"
-          text_color="DrYellow"
+          text_color="LabelTextColor"
           length="1"
           follows="left|top"
           layout="topleft"
+          name="path_test_status"
           top_pad="15"
           width="190">
-        Result: No path found.
       </text>
       <button
           follows="left|top"
-- 
cgit v1.2.3


From d4f02b1cadd9ae825c281b4f0da3c90807b90dd3 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 14 Feb 2012 18:44:25 -0800
Subject: PATH-284: Laying out new design of pathfinding console from UI
 designer.

---
 .../default/xui/en/floater_pathfinding_console.xml | 209 +++++++++++++--------
 1 file changed, 133 insertions(+), 76 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 166d0d8143..5aa53d0f93 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -2,7 +2,7 @@
 <floater
     open_positioning="cascading"
     can_tear_off="false"
-    height="270"
+    height="320"
     layout="topleft"
     name="floater_pathfinding_console"
     help_topic="floater_pathfinding_console"
@@ -10,7 +10,7 @@
     save_rect="true"
     single_instance="true"
     title="Pathfinding"
-    width="465">
+    width="455">
   <floater.string name="navmesh_fetch_initial"></floater.string>
   <floater.string name="navmesh_fetch_inprogress">Downloading the navmesh ...</floater.string>
   <floater.string name="navmesh_fetch_complete_available">Navmesh received.</floater.string>
@@ -30,8 +30,8 @@
       length="1"
       follows="left|top"
       layout="topleft"
-      left="12"
-      top="20"
+      left="15"
+      top="8"
       width="208">
     Show:
   </text>
@@ -39,59 +39,95 @@
       height="19"
       label="Navmesh"
       layout="topleft"
-      left="20"
+      left="14"
       name="show_navmesh"
-      top_pad="5"
+      top_pad="8"
       width="90" />
+  <combo_box
+      height="18"
+      layout="topleft"
+      left="34"
+      name="show_heatmap_mode"
+      width="155">
+    <combo_box.item
+        label="Show walkability map..."
+        name="show_heatmap_mode_none"
+        value="0" />
+    <combo_box.item
+        label="Character type A"
+        name="show_heatmap_mode_a"
+        value="1" />
+    <combo_box.item
+        label="Character type B"
+        name="show_heatmap_mode_b"
+        value="2" />
+    <combo_box.item
+        label="Character type C"
+        name="show_heatmap_mode_c"
+        value="3" />
+    <combo_box.item
+        label="Character type D"
+        name="show_heatmap_mode_d"
+        value="4" />
+  </combo_box>
   <check_box
       height="19"
       label="Walkables"
       layout="topleft"
-      left="20"
+      left="14"
       name="show_walkables"
-      top_pad="0"
+      top_pad="10"
       tool_tip="Functionality is not implemented currently."
       width="90" />
   <check_box
       height="19"
-      label="Static obstacles"
+      label="Material volumes"
       layout="topleft"
-      left="20"
-      name="show_static_obstacles"
-      top_pad="0"
+      left="14"
+      name="show_material_volumes"
+      top_pad="4"
       tool_tip="Functionality is not implemented currently."
       width="90" />
   <check_box
       height="19"
-      label="Material volumes"
+      label="Static obstacles"
       layout="topleft"
-      left="20"
-      name="show_material_volumes"
-      top_pad="0"
+      left="14"
+      name="show_static_obstacles"
+      top_pad="4"
       tool_tip="Functionality is not implemented currently."
       width="90" />
   <check_box
       height="19"
       label="Exclusion volumes"
       layout="topleft"
-      left="20"
+      left="14"
       name="show_exclusion_volumes"
-      top_pad="0"
+      top_pad="4"
       width="90" />
   <check_box
       height="19"
       label="World"
       layout="topleft"
-      left="20"
+      left="14"
       name="show_world"
-      top_pad="0"
+      top_pad="4"
       width="90" />
+  <view_border
+      bevel_style="none"
+      follows="top|left"
+      layout="topleft"
+      left="14"
+      height="0"
+      width="200"
+      top_pad="7"
+      visible="true" />
   <panel
-      border="true"
+      border="false"
       bevel_style="none"
       follows="left|top"
       layout="topleft"
-      height="60"
+      height="73"
       width="200">
     <text
         height="13"
@@ -101,13 +137,13 @@
         text_color="LabelTextColor"
         length="1"
         layout="topleft"
-        left="5"
+        left="0"
         top_pad="5"
-        width="190">
-      Status:
+        width="200">
+      Status
     </text>
     <text
-        height="28"
+        height="40"
         word_wrap="true"
         use_ellipses="false"
         type="string"
@@ -115,38 +151,59 @@
         length="1"
         follows="left|top"
         layout="topleft"
-        left="15"
+        left="0"
         name="pathfinding_status"
-        top_pad="10"
-        width="180">
+        top_pad="8"
+        width="200">
     </text>
   </panel>
+  <view_border
+      bevel_style="none"
+      follows="top|left"
+      layout="topleft"
+      left="14"
+      height="0"
+      width="200"
+      top_pad="0"
+      visible="true" />
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      layout="topleft"
+      left="14"
+      top_pad="18"
+      width="105">
+    Lost characters?
+  </text>
   <button
       follows="left|top"
       height="21"
-      left="20"
       label="Characters..."
       layout="topleft"
       name="view_characters_floater"
-      top_pad="10"
+      left_pad="0"
       width="96"/>
   <view_border
       bevel_style="none"
       follows="top|left"
       layout="topleft"
-      left="233"
-      top="41"
-      height="208"
-      width="216"
+      left="230"
+      top="35"
+      height="276"
+      width="215"
       visible="true" />
   <tab_container
       follows="left|top"
       layout="topleft"
       tab_position="top"
       name="edit_test_tab_container"
-      left="230"
-      top="20"
-      height="230"
+      left="226"
+      top="14"
+      height="298"
       width="220">
     <panel
         border="false"
@@ -164,22 +221,22 @@
           length="1"
           follows="left|top"
           layout="topleft"
-          left="20"
-          top_pad="10"
+          left="16"
+          top_pad="17"
           height="13"
-          width="180">
-        To blah blah blah:
+          width="190">
+        Permit object / terrain changes:
       </text>
       <button
           follows="left|top"
-          height="21"
-          left="30"
+          height="22"
+          left="16"
           enabled="false"
           label="Unfreeze"
           layout="topleft"
           name="enter_unfrozen_mode"
-          top_pad="0"
-          width="96"/>
+          top_pad="5"
+          width="116"/>
       <text
           word_wrap="true"
           use_ellipses="false"
@@ -188,22 +245,21 @@
           length="1"
           follows="left|top"
           layout="topleft"
-          left="20"
-          top_pad="10"
+          left="16"
+          top_pad="23"
           height="13"
-          width="180">
-        To blah blah blah:
+          width="190">
+        Edit linkset attributes:
       </text>
       <button
           follows="left|top"
-          height="21"
-          left="30"
-          enabled="false"
-          label="Freeze"
+          height="22"
+          left="16"
+          label="Linksets..."
           layout="topleft"
-          name="enter_frozen_mode"
-          top_pad="0"
-          width="96"/>
+          name="view_and_edit_linksets"
+          top_pad="5"
+          width="116"/>
       <text
           word_wrap="true"
           use_ellipses="false"
@@ -212,21 +268,22 @@
           length="1"
           follows="left|top"
           layout="topleft"
-          left="20"
-          top_pad="10"
-          height="13"
-          width="180">
-        View / edit linkset attributes:
+          left="16"
+          top_pad="23"
+          height="26"
+          width="190">
+        Prevent object / terrain changes and update the navmesh:
       </text>
       <button
           follows="left|top"
-          height="21"
-          left="30"
-          label="Linksets..."
+          height="22"
+          left="16"
+          enabled="false"
+          label="Freeze"
           layout="topleft"
-          name="view_and_edit_linksets"
-          top_pad="0"
-          width="96"/>
+          name="enter_frozen_mode"
+          top_pad="9"
+          width="116"/>
     </panel>
     <panel
         border="false"
@@ -245,7 +302,8 @@
           length="1"
           follows="left|top"
           layout="topleft"
-          left="20"
+          left="16"
+          top_pad="14"
           width="190">
         Character width
       </text>
@@ -285,7 +343,7 @@
           follows="left|top"
           layout="topleft"
           left_pad="-165"
-          top_pad="10"
+          top_pad="9"
           width="190">
         Character type
       </text>
@@ -295,7 +353,7 @@
           layout="topleft"
           left_delta="0"
           name="character_type"
-          top_delta="20"
+          top_delta="18"
           value="1"
           width="190">
         <radio_item
@@ -342,7 +400,7 @@
           follows="left|top"
           layout="topleft"
           left_pad="-190"
-          top_pad="10"
+          top_pad="12"
           width="190">
         Ctrl-click to select start point.
       </text>
@@ -369,17 +427,16 @@
           follows="left|top"
           layout="topleft"
           name="path_test_status"
-          top_pad="15"
+          top_pad="11"
           width="190">
       </text>
       <button
           follows="left|top"
-          height="21"
+          height="22"
           label="Clear path"
           layout="topleft"
           name="clear_path"
-          left="20"
-          top="175"
+          top_pad="27"
           width="96"/>
     </panel>
   </tab_container>
-- 
cgit v1.2.3


From 8cd7bb47c2d9c833129b76cdc09d69aa35654fa5 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 14 Feb 2012 19:33:33 -0800
Subject: PATH-297: Initial layout and basic implementation for the pathfinding
 basic floater.

---
 .../default/xui/en/floater_pathfinding_basic.xml   | 58 ++++++++++++++++++++++
 .../default/xui/en/floater_pathfinding_console.xml |  2 +-
 indra/newview/skins/default/xui/en/menu_viewer.xml | 14 +++---
 indra/newview/skins/default/xui/en/strings.xml     |  2 +
 4 files changed, 68 insertions(+), 8 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml
new file mode 100644
index 0000000000..e21b6c842f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+    open_positioning="cascading"
+    can_tear_off="false"
+    height="204"
+    layout="topleft"
+    name="floater_pathfinding_basic"
+    help_topic="floater_pathfinding_basic"
+    reuse_instance="false"
+    save_rect="false"
+    single_instance="true"
+    title="Basic pathfinding setup"
+    width="312">
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="15"
+      top="15"
+      width="289">
+    Permit object / terrain changes:
+  </text>
+  <button
+      follows="left|top"
+      height="22"
+      label="Unfreeze"
+      layout="topleft"
+      name="enter_unfrozen_mode"
+      width="116"/>
+  <text
+      height="82"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      line_spacing.multiple="1.5"
+      left="15"
+      top_pad="23"
+      width="289">
+    In unfrozen mode, you can move and make changes to objects and terrain.  When you are finished, click the Freeze button.  It may require a few minutes to process your changes.
+  </text>
+  <button
+      follows="left|top"
+      height="22"
+      label="Freeze"
+      layout="topleft"
+      name="enter_frozen_mode"
+      top_pad="0"
+      width="116"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 5aa53d0f93..3fe3dfe963 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -9,7 +9,7 @@
     reuse_instance="true"
     save_rect="true"
     single_instance="true"
-    title="Pathfinding"
+    title="Pathfinding edit / test"
     width="455">
   <floater.string name="navmesh_fetch_initial"></floater.string>
   <floater.string name="navmesh_fetch_inprogress">Downloading the navmesh ...</floater.string>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 47d6f36e1b..c4a95ce25e 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -934,21 +934,21 @@
       <menu
          create_jump_keys="true"
          label="Pathfinding"
-         name="Pathfindubg"
+         name="Pathfinding"
          tear_off="false">
         <menu_item_call
-            label="Edit/Test..."
-            name="pathfinding_console_menu_item">
+            label="Basic setup..."
+            name="pathfinding_basic_menu_item">
           <menu_item_call.on_click
               function="Floater.ToggleOrBringToFront"
-              parameter="pathfinding_console" />
+              parameter="pathfinding_basic" />
         </menu_item_call>
         <menu_item_call
-            label="Characters..."
-            name="pathfinding_characters_menu_item">
+            label="Edit / test..."
+            name="pathfinding_console_menu_item">
           <menu_item_call.on_click
               function="Floater.ToggleOrBringToFront"
-              parameter="pathfinding_characters" />
+              parameter="pathfinding_console" />
         </menu_item_call>
       </menu>
 
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 793893f540..02a07c9f02 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3696,6 +3696,7 @@ Try enclosing path to the editor with double quotes.
   <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_Basic_Label">Pathfinding Basic</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>
@@ -3725,6 +3726,7 @@ Try enclosing path to the editor with double quotes.
   <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_Basic_Tooltip">Manipulation of pathfinding frozen/unfrozen state</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>
-- 
cgit v1.2.3


From fb96262c47d9eb022f9291637c6a9ebaec833dca Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 15 Feb 2012 11:51:49 -0800
Subject: PATH-284: Stubbing functionality for the walkability heatmap
 drop-down.

---
 .../default/xui/en/floater_pathfinding_console.xml   | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 3fe3dfe963..4a41736972 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -2,7 +2,7 @@
 <floater
     open_positioning="cascading"
     can_tear_off="false"
-    height="320"
+    height="330"
     layout="topleft"
     name="floater_pathfinding_console"
     help_topic="floater_pathfinding_console"
@@ -43,14 +43,27 @@
       name="show_navmesh"
       top_pad="8"
       width="90" />
+  <text
+      height="13"
+      word_wrap="true"
+      use_ellipses="false"
+      type="string"
+      text_color="LabelTextColor"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="35"
+      width="208">
+    Show walkability heatmap:
+  </text>
   <combo_box
       height="18"
       layout="topleft"
       left="34"
       name="show_heatmap_mode"
-      width="155">
+      width="125">
     <combo_box.item
-        label="Show walkability map..."
+        label="None"
         name="show_heatmap_mode_none"
         value="0" />
     <combo_box.item
@@ -269,6 +282,7 @@
           follows="left|top"
           layout="topleft"
           left="16"
+          line_spacing.multiple="1.5"
           top_pad="23"
           height="26"
           width="190">
-- 
cgit v1.2.3


From a17dee79f04e21f414d59ed1d5566160dda8fa08 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 15 Feb 2012 15:26:32 -0800
Subject: PATH-297: Basic freeze/unfreeze button switching for UI buttons. 
 Also, adding ability to detect whether region is enabled for pathfinding.

---
 .../default/xui/en/floater_pathfinding_basic.xml   | 25 +++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml
index e21b6c842f..36c7f11f5d 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml
@@ -2,7 +2,7 @@
 <floater
     open_positioning="cascading"
     can_tear_off="false"
-    height="204"
+    height="213"
     layout="topleft"
     name="floater_pathfinding_basic"
     help_topic="floater_pathfinding_basic"
@@ -11,19 +11,36 @@
     single_instance="true"
     title="Basic pathfinding setup"
     width="312">
+  <text
+      height="13"
+      word_wrap="false"
+      use_ellipses="false"
+      type="string"
+      text_color="DrYellow"
+      length="1"
+      follows="left|top"
+      layout="topleft"
+      left="15"
+      name="disabled_warning_label"
+      top="8"
+      width="289">
+    This region is not enabled for pathfinding.
+  </text>
   <text
       height="13"
       word_wrap="true"
       use_ellipses="false"
       type="string"
       text_color="LabelTextColor"
+      text_readonly_color="LabelDisabledColor"
       length="1"
       follows="left|top"
       layout="topleft"
       left="15"
-      top="15"
+      name="unfreeze_label"
+      top_pad="4"
       width="289">
-    Permit object / terrain changes:
+    Allow object / terrain changes:
   </text>
   <button
       follows="left|top"
@@ -38,11 +55,13 @@
       use_ellipses="false"
       type="string"
       text_color="LabelTextColor"
+      text_readonly_color="LabelDisabledColor"
       length="1"
       follows="left|top"
       layout="topleft"
       line_spacing.multiple="1.5"
       left="15"
+      name="freeze_label"
       top_pad="23"
       width="289">
     In unfrozen mode, you can move and make changes to objects and terrain.  When you are finished, click the Freeze button.  It may require a few minutes to process your changes.
-- 
cgit v1.2.3


From 6ee41cfe1425c62bb1c1ac04c0f4dc4810675397 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 15 Feb 2012 16:48:50 -0800
Subject: PATH-284: Adding first pass for toggling state for frozen/unfrozen
 modes.

---
 .../default/xui/en/floater_pathfinding_console.xml | 39 +++++++++++++---------
 1 file changed, 23 insertions(+), 16 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 4a41736972..b608e513d5 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -2,7 +2,7 @@
 <floater
     open_positioning="cascading"
     can_tear_off="false"
-    height="330"
+    height="352"
     layout="topleft"
     name="floater_pathfinding_console"
     help_topic="floater_pathfinding_console"
@@ -10,12 +10,12 @@
     save_rect="true"
     single_instance="true"
     title="Pathfinding edit / test"
-    width="455">
+    width="456">
   <floater.string name="navmesh_fetch_initial"></floater.string>
   <floater.string name="navmesh_fetch_inprogress">Downloading the navmesh ...</floater.string>
   <floater.string name="navmesh_fetch_complete_available">Navmesh received.</floater.string>
   <floater.string name="navmesh_fetch_complete_none">No navmesh for region.</floater.string>
-  <floater.string name="navmesh_region_not_enabled">Pathfinding is not enabled for this region.</floater.string>
+  <floater.string name="navmesh_region_not_enabled">This region is not enabled for pathfinding.</floater.string>
   <floater.string name="navmesh_library_not_implemented">Cannot find pathing library implementation.</floater.string>
   <floater.string name="pathing_choose_start_and_end_points">Please choose start and end points.</floater.string>
   <floater.string name="pathing_choose_start_point">Please choose start point.</floater.string>
@@ -31,7 +31,7 @@
       follows="left|top"
       layout="topleft"
       left="15"
-      top="8"
+      top="9"
       width="208">
     Show:
   </text>
@@ -41,7 +41,7 @@
       layout="topleft"
       left="14"
       name="show_navmesh"
-      top_pad="8"
+      top_pad="7"
       width="90" />
   <text
       height="13"
@@ -54,14 +54,15 @@
       layout="topleft"
       left="35"
       width="208">
-    Show walkability heatmap:
+    Show walkability map:
   </text>
   <combo_box
-      height="18"
+      height="19"
       layout="topleft"
       left="34"
       name="show_heatmap_mode"
-      width="125">
+      top_pad="8"
+      width="156">
     <combo_box.item
         label="None"
         name="show_heatmap_mode_none"
@@ -133,7 +134,7 @@
       left="14"
       height="0"
       width="200"
-      top_pad="7"
+      top_pad="12"
       visible="true" />
   <panel
       border="false"
@@ -206,18 +207,18 @@
       layout="topleft"
       left="230"
       top="35"
-      height="276"
-      width="215"
+      height="305"
+      width="214"
       visible="true" />
   <tab_container
       follows="left|top"
       layout="topleft"
       tab_position="top"
       name="edit_test_tab_container"
-      left="226"
+      left="227"
       top="14"
-      height="298"
-      width="220">
+      height="327"
+      width="218">
     <panel
         border="false"
         bevel_style="none"
@@ -231,14 +232,16 @@
           use_ellipses="false"
           type="string"
           text_color="LabelTextColor"
+          text_readonly_color="LabelDisabledColor"
           length="1"
           follows="left|top"
           layout="topleft"
+          name="unfreeze_label"
           left="16"
-          top_pad="17"
+          top_pad="16"
           height="13"
           width="190">
-        Permit object / terrain changes:
+        Allow object / terrain changes:
       </text>
       <button
           follows="left|top"
@@ -255,10 +258,12 @@
           use_ellipses="false"
           type="string"
           text_color="LabelTextColor"
+          text_readonly_color="LabelDisabledColor"
           length="1"
           follows="left|top"
           layout="topleft"
           left="16"
+          name="edit_linksets_label"
           top_pad="23"
           height="13"
           width="190">
@@ -278,11 +283,13 @@
           use_ellipses="false"
           type="string"
           text_color="LabelTextColor"
+          text_readonly_color="LabelDisabledColor"
           length="1"
           follows="left|top"
           layout="topleft"
           left="16"
           line_spacing.multiple="1.5"
+          name="freeze_label"
           top_pad="23"
           height="26"
           width="190">
-- 
cgit v1.2.3


From 942c17224d5f299950abc1fbb83d1528c50b3ab2 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 15 Feb 2012 17:09:10 -0800
Subject: Backing out changeset: dda75e2e00e5

---
 .../newview/skins/default/xui/en/floater_tools.xml | 40 ----------------------
 1 file changed, 40 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index b8ed10b339..f9147ea650 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2401,46 +2401,6 @@ even though the user gets a free copy.
              name="Physics Restitution"
              top_pad="8"
              width="132" />
-          <text
-           type="string"
-           length="1"
-           follows="left|top"
-           height="10"
-           layout="topleft"
-           left_delta="0"
-           top_delta="45"
-           name="pathfinding_type_label"
-           width="121">
-            Pathfinding Type:
-          </text>
-          <radio_group
-            follows="top|left"
-            height="55"
-            layout="topleft"
-            name="edit_pathfinding_state"
-            left_delta="0"
-            top_delta="15"
-            value="1"
-            width="75">
-            <radio_item
-                label="Walkable"
-                layout="topleft"
-                height="13"
-                name="edit_pathfinding_state_walkable"
-                value="1"/>
-            <radio_item
-                label="Obstacle"
-                layout="topleft"
-                height="13"
-                name="edit_pathfinding_state_obstacle"
-                value="2"/>
-            <radio_item
-                label="Ignored"
-                layout="topleft"
-                height="13"
-                name="edit_pathfinding_state_ignored"
-                value="3"/>
-          </radio_group>
         </panel>
          <panel
          border="false"
-- 
cgit v1.2.3


From e156e9ed03fd16af36e2b28823f07658f4d9b0c8 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 16 Feb 2012 14:55:21 -0800
Subject: PATH-292: First pass at implementing the new design of the linksets
 floater.

---
 .../xui/en/floater_pathfinding_linksets.xml        | 864 ++++++++++++---------
 1 file changed, 483 insertions(+), 381 deletions(-)

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

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 ec720b55ca..badade9661 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -3,9 +3,9 @@
     open_positioning="cascading"
     can_resize="true"
     can_tear_off="false"
-    height="330"
+    height="382"
     width="950"
-    min_height="330"
+    min_height="382"
     min_width="950"
     layout="topleft"
     name="floater_pathfinding_linksets"
@@ -27,401 +27,503 @@
   <floater.string name="linksets_messaging_complete_none_found">No pathfinding linksets</floater.string>
   <floater.string name="linksets_messaging_complete_available">[NUM_SELECTED] linksets selected out of [NUM_TOTAL]</floater.string>
   <floater.string name="linksets_messaging_service_not_available">Required capability is not available in current region</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
-      height="13"
-      word_wrap="false"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="20"
-      top="16"
-      width="67">
-    Filter by:
-  </text>
-  <text
-      height="13"
-      word_wrap="false"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="87"
-      top="16"
-      width="62">
-    Name
-  </text>
-  <line_editor
-      border_style="line"
-      border_thickness="1"
-      follows="left|top"
-      height="20"
-      layout="topleft"
-      left_delta="62"
-      top="11"
-      max_length_bytes="10"
-      name="filter_by_name"
-      width="105" />
-  <text
-      height="13"
-      word_wrap="false"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="273"
-      top="16"
-      width="88">
-    Description
-  </text>
-  <line_editor
-      border_style="line"
-      border_thickness="1"
-      follows="left|top"
-      height="20"
-      layout="topleft"
-      left_delta="88"
-      top="11"
-      max_length_bytes="10"
-      name="filter_by_description"
-      width="106" />
-  <check_box
-      height="19"
-      follows="left|top"
-      initial_value="true"
-      label="Walkable"
-      layout="topleft"
-      left="481"
-      top="14"
-      name="filter_by_walkable"
-      width="90" />
-  <check_box
-      height="19"
-      follows="left|top"
-      initial_value="true"
-      label="Obstacle"
-      layout="topleft"
-      left="577"
-      top="14"
-      name="filter_by_obstacle"
-      width="90" />
-  <check_box
-      height="19"
-      follows="left|top"
-      initial_value="true"
-      label="Ignored"
-      layout="topleft"
-      left="674"
-      top="14"
-      name="filter_by_ignored"
-      width="90" />
-  <button
-      follows="right|top"
-      height="21"
-      label="Apply"
-      layout="topleft"
-      name="apply_filters"
-      top="11"
-      left="769"
-      width="73"/>
-  <button
-      follows="right|top"
-      height="21"
-      label="Clear"
+  <floater.string name="linkset_use_walkable">Walkable</floater.string>
+  <floater.string name="linkset_use_static_obstacle">Static obstacle</floater.string>
+  <floater.string name="linkset_use_dynamic_obstacle">Dynamic obstacle</floater.string>
+  <floater.string name="linkset_use_material_volume">Material volume</floater.string>
+  <floater.string name="linkset_use_exclusion_volume">Exclusion volume</floater.string>
+  <floater.string name="linkset_use_dynamic_phantom">Dynamic phantom</floater.string>
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|top|right|bottom"
       layout="topleft"
-      name="clear_filters"
-      top="11"
-      left="851"
-      width="73"/>
-  <scroll_list
-      column_padding="0"
-      draw_heading="true"
-      follows="all"
-      height="135"
+      height="226"
+      width="950">
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left="20"
+        top_pad="14"
+        width="67">
+      Filter by:
+    </text>
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left_pad="0"
+        width="62">
+      Name
+    </text>
+    <line_editor
+        border_style="line"
+        border_thickness="1"
+        follows="left|top"
+        height="20"
+        layout="topleft"
+        left_pad="0"
+        top_pad="-18"
+        max_length_bytes="10"
+        name="filter_by_name"
+        width="105" />
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left_pad="22"
+        top_pad="-15"
+        width="88">
+      Description
+    </text>
+    <line_editor
+        border_style="line"
+        border_thickness="1"
+        follows="left|top"
+        height="20"
+        layout="topleft"
+        left_pad="0"
+        top_pad="-17"
+        max_length_bytes="10"
+        name="filter_by_description"
+        width="145" />
+    <combo_box
+        height="20"
+        layout="topleft"
+        follows="left|top"
+        name="filter_by_linkset_use"
+        left_pad="32"
+        top_pad="-20"
+        width="199">
+      <combo_box.item
+          label="Filter by linkset use..."
+          name="filter_by_linkset_use_none"
+          value="0" />
+      <combo_box.item
+          label="Walkable"
+          name="filter_by_linkset_use_walkable"
+          value="1" />
+      <combo_box.item
+          label="Static obstacle"
+          name="filter_by_linkset_use_static_obstacle"
+          value="2" />
+      <combo_box.item
+          label="Dynamic obstacle"
+          name="filter_by_linkset_use_dynamic_obstacle"
+          value="3" />
+      <combo_box.item
+          label="Material volume"
+          name="filter_by_linkset_use_material_volume"
+          value="4" />
+      <combo_box.item
+          label="Exclusion volume"
+          name="filter_by_linkset_use_exclusion_volume"
+          value="5" />
+      <combo_box.item
+          label="Dynamic phantom"
+          name="filter_by_linkset_use_dynamic_phantom"
+          value="6" />
+    </combo_box>
+    <button
+        follows="right|top"
+        height="21"
+        label="Apply"
+        layout="topleft"
+        name="apply_filters"
+        top_pad="-21"
+        left_pad="31"
+        width="73"/>
+    <button
+        follows="right|top"
+        height="21"
+        label="Clear"
+        layout="topleft"
+        name="clear_filters"
+        top_pad="-21"
+        left_pad="8"
+        width="73"/>
+    <scroll_list
+        column_padding="0"
+        draw_heading="true"
+        follows="all"
+        height="135"
+        layout="topleft"
+        left="18"
+        top_pad="15"
+        multi_select="true"
+        name="pathfinding_linksets"
+        width="910">
+      <scroll_list.columns
+          label="Name (root prim)"
+          name="name"
+          dynamic_width="true" />
+      <scroll_list.columns
+          label="Description (root prim)"
+          name="description"
+          width="192" />
+      <scroll_list.columns
+          label="Land impact"
+          name="land_impact"
+          width="88" />
+      <scroll_list.columns
+          label="Dist from you"
+          name="dist_from_you"
+          width="97" />
+      <scroll_list.columns
+          label="Linkset use"
+          name="linkset_use"
+          width="210" />
+      <scroll_list.columns
+          label="A %"
+          name="a_percent"
+          width="41" />
+      <scroll_list.columns
+          label="B %"
+          name="b_percent"
+          width="41" />
+      <scroll_list.columns
+          label="C %"
+          name="c_percent"
+          width="41" />
+      <scroll_list.columns
+          label="D %"
+          name="d_percent"
+          width="41" />
+    </scroll_list>
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        follows="left|bottom"
+        layout="topleft"
+        name="linksets_status"
+        top_pad="17"
+        width="549">
+      Linksets:
+    </text>
+    <button
+        follows="right|bottom"
+        height="21"
+        label="Refresh list"
+        layout="topleft"
+        name="refresh_linksets_list"
+        top_pad="-16"
+        left_pad="0"
+        width="115"/>
+    <button
+        follows="right|bottom"
+        height="21"
+        label="Select all"
+        layout="topleft"
+        name="select_all_linksets"
+        top_pad="-21"
+        left_pad="8"
+        width="115"/>
+    <button
+        follows="right|bottom"
+        height="21"
+        label="Select none"
+        layout="topleft"
+        name="select_none_linksets"
+        top_pad="-21"
+        left_pad="8"
+        width="115"/>
+  </panel>
+  <view_border
+      bevel_style="none"
+      follows="left|bottom|right"
+      height="0"
       layout="topleft"
+      name="horiz_separator"
+      top_pad="0"
       left="18"
-      top="48"
-      multi_select="true"
-      name="pathfinding_linksets"
-      width="910">
-    <scroll_list.columns
-        label="Name (root prim)"
-        name="name"
-        dynamic_width="true" />
-    <scroll_list.columns
-        label="Description (root prim)"
-        name="description"
-        width="212" />
-    <scroll_list.columns
-        label="Land impact"
-        name="land_impact"
-        width="95" />
-    <scroll_list.columns
-        label="Dist from you"
-        name="dist_from_you"
-        width="97" />
-    <scroll_list.columns
-        label="State"
-        name="path_state"
-        width="74" />
-    <scroll_list.columns
-        label="Phantom"
-        name="is_phantom"
-        width="74" />
-    <scroll_list.columns
-        label="A %"
-        name="a_percent"
-        width="41" />
-    <scroll_list.columns
-        label="B %"
-        name="b_percent"
-        width="41" />
-    <scroll_list.columns
-        label="C %"
-        name="c_percent"
-        width="41" />
-    <scroll_list.columns
-        label="D %"
-        name="d_percent"
-        width="41" />
-  </scroll_list>
-  <text
-      height="13"
-      word_wrap="false"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|bottom"
-      layout="topleft"
-      name="linksets_status"
-      top="200"
-      width="500">
-    Linksets:
-  </text>
-  <button
-      follows="right|bottom"
-      height="21"
-      label="Refresh list"
-      layout="topleft"
-      name="refresh_linksets_list"
-      top="200"
-      left="568"
-      width="115"/>
-  <button
-      follows="right|bottom"
-      height="21"
-      label="Select all"
-      layout="topleft"
-      name="select_all_linksets"
-      top="200"
-      left="690"
-      width="115"/>
-  <button
-      follows="right|bottom"
-      height="21"
-      label="Select none"
+      width="912"/>
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|right|bottom"
       layout="topleft"
-      name="select_none_linksets"
-      top="200"
-      left="812"
-      width="115"/>
+      left="0"
+      height="67"
+      width="950">
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        left="18"
+        follows="left|bottom|right"
+        layout="topleft"
+        top_pad="8"
+        width="912">
+      Actions on selected linksets (If a linkset is removed from the world, its attributes will be lost):
+    </text>
+    <button
+        follows="left|bottom"
+        height="21"
+        label="Take"
+        layout="topleft"
+        name="take_linksets"
+        top_pad="12"
+        left="18"
+        width="95"/>
+    <button
+        follows="left|bottom"
+        height="21"
+        label="Take copy"
+        layout="topleft"
+        name="take_copy_linksets"
+        top_pad="-21"
+        left_pad="6"
+        width="95"/>
+    <button
+        follows="left|bottom"
+        height="21"
+        label="Return"
+        layout="topleft"
+        name="return_linksets"
+        top_pad="-21"
+        left_pad="6"
+        width="95"/>
+    <button
+        follows="left|bottom"
+        height="21"
+        label="Delete"
+        layout="topleft"
+        name="delete_linksets"
+        top_pad="-21"
+        left_pad="6"
+        width="95"/>
+    <button
+        follows="left|bottom"
+        height="21"
+        label="Teleport me to it"
+        layout="topleft"
+        name="teleport_me_to_linkset"
+        top_pad="-21"
+        left_pad="6"
+        width="160"/>
+  </panel>
   <view_border
       bevel_style="none"
       follows="left|bottom|right"
       height="0"
       layout="topleft"
       name="horiz_separator"
-      top="230"
-      left="20"
+      top_pad="0"
+      left="18"
       width="912"/>
-  <text
-      height="13"
-      word_wrap="false"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|bottom"
-      layout="topleft"
-      top_pad="12"
-      width="910">
-    Select row(s) to edit attributes of linkset(s).  If a linkset is deleted or returned to inventory, attributes assigned to it will be lost.
-  </text>
-  <radio_group
-      follows="left|bottom"
-      height="55"
-      value="1"
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|right|bottom"
       layout="topleft"
-      left_delta="0"
-      name="edit_path_state"
-      top_delta="21"
-      width="138">
-    <radio_item
-        label="Walkable"
+      left="0"
+      height="75"
+      width="950">
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        follows="left|bottom"
+        layout="topleft"
+        left="18"
+        top_pad="8"
+        width="912">
+      Edit attributes of selected linksets
+    </text>
+    <combo_box
+        height="20"
         layout="topleft"
+        follows="left|top"
+        name="edit_linkset_use"
+        left="18"
+        top_pad="17"
+        width="199">
+      <combo_box.item
+          label="Choose linkset use..."
+          name="edit_linkset_use_none"
+          value="0" />
+      <combo_box.item
+          label="Walkable"
+          name="edit_linkset_use_walkable"
+          value="1" />
+      <combo_box.item
+          label="Static obstacle"
+          name="edit_linkset_use_static_obstacle"
+          value="2" />
+      <combo_box.item
+          label="Dynamic obstacle"
+          name="edit_linkset_use_dynamic_obstacle"
+          value="3" />
+      <combo_box.item
+          label="Material volume"
+          name="edit_linkset_use_material_volume"
+          value="4" />
+      <combo_box.item
+          label="Exclusion volume"
+          name="edit_linkset_use_exclusion_volume"
+          value="5" />
+      <combo_box.item
+          label="Dynamic phantom"
+          name="edit_linkset_use_dynamic_phantom"
+          value="6" />
+    </combo_box>
+    <text
         height="13"
-        name="edit_pathing_state_walkable"
-        value="1"/>
-    <radio_item
-        label="Obstacle"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        name="walkability_coefficients_label"
+        length="1"
+        follows="left|bottom"
         layout="topleft"
+        left_pad="36"
+        top_pad="-17"
+        width="110">
+      Walkability:
+    </text>
+    <text
         height="13"
-        name="edit_pathing_state_obstacle"
-        value="2"/>
-    <radio_item
-        label="Ignored"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        name="edit_a_label"
+        length="1"
+        follows="left|bottom"
         layout="topleft"
+        left_pad="0"
+        width="18">
+      A
+    </text>
+    <line_editor
+        border_style="line"
+        border_thickness="1"
+        follows="left|bottom"
+        height="21"
+        layout="topleft"
+        left_pad="0"
+        top_pad="-19"
+        max_length_chars="3"
+        name="edit_a_value"
+        width="45" />
+    <text
         height="13"
-        name="edit_pathing_state_ignored"
-        value="3"/>
-  </radio_group>
-  <text
-      height="13"
-      word_wrap="false"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      text_readonly_color="LabelDisabledColor"
-      name="walkability_coefficients_label"
-      length="1"
-      follows="left|bottom"
-      layout="topleft"
-      left="159"
-      top="271"
-      width="200">
-    Walkability coefficients
-  </text>
-  <text
-      height="13"
-      word_wrap="false"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      text_readonly_color="LabelDisabledColor"
-      name="edit_a_label"
-      length="1"
-      follows="left|bottom"
-      layout="topleft"
-      top_pad="12"
-      width="90">
-    A
-  </text>
-  <line_editor
-      border_style="line"
-      border_thickness="1"
-      follows="left|bottom"
-      height="20"
-      layout="topleft"
-      left_delta="14"
-      max_length_chars="3"
-      name="edit_a_value"
-      width="45" />
-  <text
-      height="13"
-      word_wrap="false"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      text_readonly_color="LabelDisabledColor"
-      name="edit_b_label"
-      length="1"
-      follows="left|bottom"
-      layout="topleft"
-      left="248"
-      top_pad="-13"
-      width="90">
-    B
-  </text>
-  <line_editor
-      border_style="line"
-      border_thickness="1"
-      follows="left|bottom"
-      height="20"
-      layout="topleft"
-      left_delta="14"
-      max_length_chars="3"
-      name="edit_b_value"
-      width="45" />
-  <text
-      height="13"
-      word_wrap="false"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      text_readonly_color="LabelDisabledColor"
-      name="edit_c_label"
-      length="1"
-      follows="left|bottom"
-      layout="topleft"
-      left="337"
-      top_pad="-13"
-      width="90">
-    C
-  </text>
-  <line_editor
-      border_style="line"
-      border_thickness="1"
-      follows="left|bottom"
-      height="20"
-      layout="topleft"
-      left_delta="14"
-      max_length_chars="3"
-      name="edit_c_value"
-      width="45" />
-  <text
-      height="13"
-      word_wrap="false"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      text_readonly_color="LabelDisabledColor"
-      name="edit_d_label"
-      length="1"
-      follows="left|bottom"
-      layout="topleft"
-      left="426"
-      top_pad="-13"
-      width="90">
-    D
-  </text>
-  <line_editor
-      border_style="line"
-      border_thickness="1"
-      follows="left|bottom"
-      height="20"
-      layout="topleft"
-      left_delta="14"
-      max_length_chars="3"
-      name="edit_d_value"
-      width="45" />
-  <check_box
-      follows="left|bottom"
-      height="19"
-      label="Phantom"
-      layout="topleft"
-      name="edit_phantom_value"
-      top="271"
-      left="559"
-      width="90" />
-  <button
-      follows="right|bottom"
-      height="21"
-      label="Apply changes"
-      layout="topleft"
-      name="apply_edit_values"
-      top="270"
-      left="735"
-      width="134"/>
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        name="edit_b_label"
+        length="1"
+        follows="left|bottom"
+        layout="topleft"
+        left_pad="44"
+        top_pad="-15"
+        width="18">
+      B
+    </text>
+    <line_editor
+        border_style="line"
+        border_thickness="1"
+        follows="left|bottom"
+        height="21"
+        layout="topleft"
+        left_pad="0"
+        top_pad="-19"
+        max_length_chars="3"
+        name="edit_b_value"
+        width="45" />
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        name="edit_c_label"
+        length="1"
+        follows="left|bottom"
+        layout="topleft"
+        left_pad="44"
+        top_pad="-15"
+        width="18">
+      C
+    </text>
+    <line_editor
+        border_style="line"
+        border_thickness="1"
+        follows="left|bottom"
+        height="21"
+        layout="topleft"
+        left_pad="0"
+        top_pad="-19"
+        max_length_chars="3"
+        name="edit_c_value"
+        width="45" />
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        name="edit_d_label"
+        length="1"
+        follows="left|bottom"
+        layout="topleft"
+        left_pad="44"
+        top_pad="-15"
+        width="18">
+      D
+    </text>
+    <line_editor
+        border_style="line"
+        border_thickness="1"
+        follows="left|bottom"
+        height="21"
+        layout="topleft"
+        left_pad="0"
+        top_pad="-19"
+        max_length_chars="3"
+        name="edit_d_value"
+        width="45" />
+    <button
+        follows="right|bottom"
+        height="21"
+        label="Apply changes"
+        layout="topleft"
+        name="apply_edit_values"
+        top_pad="-21"
+        left_pad="40"
+        width="140"/>
+  </panel>
 </floater>
-- 
cgit v1.2.3


From a73ec672d1bb163e156e2c9bc8a38be5fa2d2b0d Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 16 Feb 2012 16:49:31 -0800
Subject: PATH-292: Adding an additional show beacons checkbox for the linksets
 floater.

---
 .../skins/default/xui/en/floater_pathfinding_linksets.xml   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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

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 badade9661..60d547c5f4 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -276,16 +276,25 @@
         follows="left|bottom|right"
         layout="topleft"
         top_pad="8"
-        width="912">
+        width="580">
       Actions on selected linksets (If a linkset is removed from the world, its attributes will be lost):
     </text>
+    <check_box
+        height="19"
+        follows="left|bottom"
+        label="Show beacon"
+        layout="topleft"
+        name="show_beacon"
+        left_pad="0"
+        top_pad="-16"
+        width="90" />
     <button
         follows="left|bottom"
         height="21"
         label="Take"
         layout="topleft"
         name="take_linksets"
-        top_pad="12"
+        top_pad="9"
         left="18"
         width="95"/>
     <button
-- 
cgit v1.2.3


From 35b09a722e72a397a1e1e7aacbda8f39f4c1faa5 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 17 Feb 2012 11:37:49 -0800
Subject: PATH-310: Switching the cpu time display from milliseconds to
 microseconds to properly indicate the correct values.

---
 indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
index 8cd220553f..e9d58c7a33 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -23,6 +23,7 @@
   <floater.string name="characters_messaging_complete_none_found">No pathfinding characters</floater.string>
   <floater.string name="characters_messaging_complete_available">[NUM_SELECTED] characters selected out of [NUM_TOTAL]</floater.string>
   <floater.string name="characters_messaging_service_not_available">Required capability is not available in current region</floater.string>
+  <floater.string name="character_cpu_time">[CPU_TIME] µs</floater.string>
   <scroll_list
       column_padding="0"
       draw_heading="true"
-- 
cgit v1.2.3


From 516ad5b3c234321daf01294d6e03bdc4be019d36 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 17 Feb 2012 19:03:16 -0800
Subject: PATH-292: Implementing the new freeze/unfreeze functionality on the
 basic panel.

---
 indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml
index 36c7f11f5d..f53d11bb1d 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml
@@ -11,6 +11,8 @@
     single_instance="true"
     title="Basic pathfinding setup"
     width="312">
+  <floater.string name="pathfinding_not_enabled">This region is not enabled for pathfinding.</floater.string>
+  <floater.string name="unable_to_change_state">Unable to change modes successfully.</floater.string>
   <text
       height="13"
       word_wrap="false"
@@ -21,10 +23,9 @@
       follows="left|top"
       layout="topleft"
       left="15"
-      name="disabled_warning_label"
+      name="status_label"
       top="8"
       width="289">
-    This region is not enabled for pathfinding.
   </text>
   <text
       height="13"
-- 
cgit v1.2.3


From 1757f3967874a2885b45e3324bf19f677e76f6bc Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 21 Feb 2012 18:40:40 -0800
Subject: PATH-296: Refining the behavior of the freeze/unfreeze functionality
 to support both basic and edit/test pathfinding floaters open at the same
 time.

---
 indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml
index f53d11bb1d..7af40bbff6 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml
@@ -11,14 +11,15 @@
     single_instance="true"
     title="Basic pathfinding setup"
     width="312">
-  <floater.string name="pathfinding_not_enabled">This region is not enabled for pathfinding.</floater.string>
-  <floater.string name="unable_to_change_state">Unable to change modes successfully.</floater.string>
+  <floater.string name="status_pathfinding_not_enabled">This region is not enabled for pathfinding.</floater.string>
+  <floater.string name="status_unable_to_change_state">Unable to change modes successfully.</floater.string>
+  <floater.string name="status_querying_state">Checking status ...</floater.string>
   <text
       height="13"
       word_wrap="false"
       use_ellipses="false"
       type="string"
-      text_color="DrYellow"
+      text_color="LabelTextColor"
       length="1"
       follows="left|top"
       layout="topleft"
-- 
cgit v1.2.3


From 73aa47f391341e6d6ef5136ef73302be689d3e9d Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 23 Feb 2012 16:51:06 -0800
Subject: PATH-292: Reworking how and where linksets are requested and managed.

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

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

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 60d547c5f4..f7e78a91cc 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -15,24 +15,20 @@
     single_instance="true"
     title="Pathfinding linksets">
   <floater.string name="linksets_messaging_initial"></floater.string>
-  <floater.string name="linksets_messaging_fetch_starting">Building query for pathfinding linksets ...</floater.string>
-  <floater.string name="linksets_messaging_fetch_inprogress">Querying for pathfinding linksets ...</floater.string>
-  <floater.string name="linksets_messaging_fetch_inprogress_multi_request">Querying for pathfinding linksets (already in progress) ...</floater.string>
-  <floater.string name="linksets_messaging_fetch_received">Loading pathfinding linksets data from response ...</floater.string>
-  <floater.string name="linksets_messaging_fetch_error">Error detected while querying for pathfinding linksets</floater.string>
-  <floater.string name="linksets_messaging_modify_starting">Building modify message for selected pathfinding linksets ...</floater.string>
-  <floater.string name="linksets_messaging_modify_inprogress">Modifying selected pathfinding linksets ...</floater.string>
-  <floater.string name="linksets_messaging_modify_received">Loading modified pathfinding linksets data from response ...</floater.string>
-  <floater.string name="linksets_messaging_modify_error">Error detected while modifying for pathfinding linksets</floater.string>
+  <floater.string name="linksets_messaging_get_inprogress">Querying for pathfinding linksets ...</floater.string>
+  <floater.string name="linksets_messaging_get_error">Error detected while querying for pathfinding linksets</floater.string>
+  <floater.string name="linksets_messaging_set_inprogress">Modifying selected pathfinding linksets ...</floater.string>
+  <floater.string name="linksets_messaging_set_error">Error detected while modifying selected pathfinding linksets</floater.string>
   <floater.string name="linksets_messaging_complete_none_found">No pathfinding linksets</floater.string>
   <floater.string name="linksets_messaging_complete_available">[NUM_SELECTED] linksets selected out of [NUM_TOTAL]</floater.string>
-  <floater.string name="linksets_messaging_service_not_available">Required capability is not available in current region</floater.string>
+  <floater.string name="linksets_messaging_not_enabled">This region is not enabled for pathfinding.</floater.string>
   <floater.string name="linkset_use_walkable">Walkable</floater.string>
   <floater.string name="linkset_use_static_obstacle">Static obstacle</floater.string>
   <floater.string name="linkset_use_dynamic_obstacle">Dynamic obstacle</floater.string>
   <floater.string name="linkset_use_material_volume">Material volume</floater.string>
   <floater.string name="linkset_use_exclusion_volume">Exclusion volume</floater.string>
   <floater.string name="linkset_use_dynamic_phantom">Dynamic phantom</floater.string>
+  <floater.string name="linkset_is_locked_state">[locked]</floater.string>
   <panel
       border="false"
       bevel_style="none"
-- 
cgit v1.2.3


From e434cb1f224c4480b590a252fcf3baac92c7f4bd Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 24 Feb 2012 15:54:38 -0800
Subject: Adding the direct path to the Characters floater from the build menu.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index c4a95ce25e..0543482578 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -950,6 +950,13 @@
               function="Floater.ToggleOrBringToFront"
               parameter="pathfinding_console" />
         </menu_item_call>
+        <menu_item_call
+            label="Characters..."
+            name="pathfinding_characters_menu_item">
+          <menu_item_call.on_click
+              function="Floater.ToggleOrBringToFront"
+              parameter="pathfinding_characters" />
+        </menu_item_call>
       </menu>
 
 
-- 
cgit v1.2.3


From 9b06300e2c94eae83a29637073f65d4ffc73bf6d Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Sat, 25 Feb 2012 22:27:06 -0800
Subject: PATH-292: Adding the ability to view and edit pathfinding attributes
 of the terrain.

---
 indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml | 4 ++++
 1 file changed, 4 insertions(+)

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

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 f7e78a91cc..a7c902e45a 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -22,6 +22,10 @@
   <floater.string name="linksets_messaging_complete_none_found">No pathfinding linksets</floater.string>
   <floater.string name="linksets_messaging_complete_available">[NUM_SELECTED] linksets selected out of [NUM_TOTAL]</floater.string>
   <floater.string name="linksets_messaging_not_enabled">This region is not enabled for pathfinding.</floater.string>
+  <floater.string name="linkset_terrain_name">[Terrain]</floater.string>
+  <floater.string name="linkset_terrain_description">--</floater.string>
+  <floater.string name="linkset_terrain_land_impact">--</floater.string>
+  <floater.string name="linkset_terrain_dist_from_you">--</floater.string>
   <floater.string name="linkset_use_walkable">Walkable</floater.string>
   <floater.string name="linkset_use_static_obstacle">Static obstacle</floater.string>
   <floater.string name="linkset_use_dynamic_obstacle">Dynamic obstacle</floater.string>
-- 
cgit v1.2.3


From 518bc51e668570beeec5f13fd2f3cc4d28f66551 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 27 Feb 2012 15:43:58 -0800
Subject: PATH-292: Adding better usability and warning notifications for the
 handling of locked linksets.

---
 .../xui/en/floater_pathfinding_linksets.xml        | 31 ++--------------------
 .../newview/skins/default/xui/en/notifications.xml | 15 ++++++++++-
 2 files changed, 16 insertions(+), 30 deletions(-)

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

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 a7c902e45a..e8cfcd30a6 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -32,7 +32,8 @@
   <floater.string name="linkset_use_material_volume">Material volume</floater.string>
   <floater.string name="linkset_use_exclusion_volume">Exclusion volume</floater.string>
   <floater.string name="linkset_use_dynamic_phantom">Dynamic phantom</floater.string>
-  <floater.string name="linkset_is_locked_state">[locked]</floater.string>
+  <floater.string name="linkset_is_locked_state">[restricted]</floater.string>
+  <floater.string name="linkset_choose_use">Choose linkset use...</floater.string>
   <panel
       border="false"
       bevel_style="none"
@@ -373,34 +374,6 @@
         left="18"
         top_pad="17"
         width="199">
-      <combo_box.item
-          label="Choose linkset use..."
-          name="edit_linkset_use_none"
-          value="0" />
-      <combo_box.item
-          label="Walkable"
-          name="edit_linkset_use_walkable"
-          value="1" />
-      <combo_box.item
-          label="Static obstacle"
-          name="edit_linkset_use_static_obstacle"
-          value="2" />
-      <combo_box.item
-          label="Dynamic obstacle"
-          name="edit_linkset_use_dynamic_obstacle"
-          value="3" />
-      <combo_box.item
-          label="Material volume"
-          name="edit_linkset_use_material_volume"
-          value="4" />
-      <combo_box.item
-          label="Exclusion volume"
-          name="edit_linkset_use_exclusion_volume"
-          value="5" />
-      <combo_box.item
-          label="Dynamic phantom"
-          name="edit_linkset_use_dynamic_phantom"
-          value="6" />
     </combo_box>
     <text
         height="13"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index af75d49353..f70d4db0f2 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7663,7 +7663,20 @@ The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;
       notext="Cancel"
       ignoretext="Confirm before hiding UI"/>
   </notification>
-  
+
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingLinksets_SetLinksetUseMismatchOnRestricted"
+   type="alertmodal">
+    Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because of permission restrictions on the linkset.  These linksets will be set to be '[RESTRICTED_TYPE]' instead.
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Do you wish to proceed?"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
   <global name="UnsupportedGLRequirements">
 You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_NAME] requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
 
-- 
cgit v1.2.3


From 10ab7acd3a9f62c0dfd2c91990f528ae3598010a Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 27 Feb 2012 17:43:16 -0800
Subject: PATH-292: Ensuring that the terrain linkset use is clearly called out
 as unmodifiable.

---
 indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

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 e8cfcd30a6..15583ea0c3 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -32,7 +32,8 @@
   <floater.string name="linkset_use_material_volume">Material volume</floater.string>
   <floater.string name="linkset_use_exclusion_volume">Exclusion volume</floater.string>
   <floater.string name="linkset_use_dynamic_phantom">Dynamic phantom</floater.string>
-  <floater.string name="linkset_is_locked_state">[restricted]</floater.string>
+  <floater.string name="linkset_is_terrain">[unmodifiable]</floater.string>
+  <floater.string name="linkset_is_restricted_state">[restricted]</floater.string>
   <floater.string name="linkset_choose_use">Choose linkset use...</floater.string>
   <panel
       border="false"
-- 
cgit v1.2.3


From 82acfb8b4d768c1330ce08a20d510a475169338d Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 27 Feb 2012 17:57:37 -0800
Subject: PATH-292: Adding verbage to the floater to explain that users must
 click the apply changes to persist edits.

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

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

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 15583ea0c3..38adda6655 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -365,7 +365,7 @@
         left="18"
         top_pad="8"
         width="912">
-      Edit attributes of selected linksets
+      Edit attributes of selected linksets and press the button to apply changes
     </text>
     <combo_box
         height="20"
-- 
cgit v1.2.3


From 9c4cc94174330affbcae8526bee34d6eb1dce0e4 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 29 Feb 2012 17:27:58 -0800
Subject: Altering the displayed names of Dynamic objects to be Movable
 instead.

---
 .../newview/skins/default/xui/en/floater_pathfinding_linksets.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

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 38adda6655..d00b85f5d7 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -28,10 +28,10 @@
   <floater.string name="linkset_terrain_dist_from_you">--</floater.string>
   <floater.string name="linkset_use_walkable">Walkable</floater.string>
   <floater.string name="linkset_use_static_obstacle">Static obstacle</floater.string>
-  <floater.string name="linkset_use_dynamic_obstacle">Dynamic obstacle</floater.string>
+  <floater.string name="linkset_use_dynamic_obstacle">Movable obstacle</floater.string>
   <floater.string name="linkset_use_material_volume">Material volume</floater.string>
   <floater.string name="linkset_use_exclusion_volume">Exclusion volume</floater.string>
-  <floater.string name="linkset_use_dynamic_phantom">Dynamic phantom</floater.string>
+  <floater.string name="linkset_use_dynamic_phantom">Movable phantom</floater.string>
   <floater.string name="linkset_is_terrain">[unmodifiable]</floater.string>
   <floater.string name="linkset_is_restricted_state">[restricted]</floater.string>
   <floater.string name="linkset_choose_use">Choose linkset use...</floater.string>
@@ -126,7 +126,7 @@
           name="filter_by_linkset_use_static_obstacle"
           value="2" />
       <combo_box.item
-          label="Dynamic obstacle"
+          label="Movable obstacle"
           name="filter_by_linkset_use_dynamic_obstacle"
           value="3" />
       <combo_box.item
@@ -138,7 +138,7 @@
           name="filter_by_linkset_use_exclusion_volume"
           value="5" />
       <combo_box.item
-          label="Dynamic phantom"
+          label="Movable phantom"
           name="filter_by_linkset_use_dynamic_phantom"
           value="6" />
     </combo_box>
-- 
cgit v1.2.3


From a33e24413ea74aaad91d9eeaa685d1c523c5d210 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 2 Mar 2012 19:17:16 -0800
Subject: PATH-304,PATH-205: Initial reworking of the navmesh download
 functionality.

---
 .../skins/default/xui/en/floater_pathfinding_console.xml   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index b608e513d5..5577083303 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -11,12 +11,14 @@
     single_instance="true"
     title="Pathfinding edit / test"
     width="456">
-  <floater.string name="navmesh_fetch_initial"></floater.string>
-  <floater.string name="navmesh_fetch_inprogress">Downloading the navmesh ...</floater.string>
-  <floater.string name="navmesh_fetch_complete_available">Navmesh received.</floater.string>
-  <floater.string name="navmesh_fetch_complete_none">No navmesh for region.</floater.string>
-  <floater.string name="navmesh_region_not_enabled">This region is not enabled for pathfinding.</floater.string>
-  <floater.string name="navmesh_library_not_implemented">Cannot find pathing library implementation.</floater.string>
+  <floater.string name="navmesh_status_unknown"></floater.string>
+  <floater.string name="navmesh_status_library_not_implemented">Cannot find pathing library implementation.</floater.string>
+  <floater.string name="navmesh_status_region_not_enabled">This region is not enabled for pathfinding.</floater.string>
+  <floater.string name="navmesh_status_downloading">Downloading the navmesh ...</floater.string>
+  <floater.string name="navmesh_status_has_navmesh">Navmesh received.</floater.string>
+  <floater.string name="navmesh_status_has_navmesh_downloading">Downloading the latest navmesh ...</floater.string>
+  <floater.string name="navmesh_status_download_error">Unable to download navmesh successfully.</floater.string>
+  <floater.string name="navmesh_status_navmesh_error">Unable to understand data format of the navmesh.</floater.string>
   <floater.string name="pathing_choose_start_and_end_points">Please choose start and end points.</floater.string>
   <floater.string name="pathing_choose_start_point">Please choose start point.</floater.string>
   <floater.string name="pathing_choose_end_point">Please choose end point.</floater.string>
-- 
cgit v1.2.3


From 581de7c7b8025c48e585c1af80e060af94aca328 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 5 Mar 2012 17:20:35 -0800
Subject: PATH-205,PATH-304: More work to handle downloading of out-of-date
 navmeshes.

---
 indra/newview/skins/default/xui/en/floater_pathfinding_console.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 5577083303..6c97af2878 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -17,8 +17,7 @@
   <floater.string name="navmesh_status_downloading">Downloading the navmesh ...</floater.string>
   <floater.string name="navmesh_status_has_navmesh">Navmesh received.</floater.string>
   <floater.string name="navmesh_status_has_navmesh_downloading">Downloading the latest navmesh ...</floater.string>
-  <floater.string name="navmesh_status_download_error">Unable to download navmesh successfully.</floater.string>
-  <floater.string name="navmesh_status_navmesh_error">Unable to understand data format of the navmesh.</floater.string>
+  <floater.string name="navmesh_status_error">Unable to download navmesh successfully.</floater.string>
   <floater.string name="pathing_choose_start_and_end_points">Please choose start and end points.</floater.string>
   <floater.string name="pathing_choose_start_point">Please choose start point.</floater.string>
   <floater.string name="pathing_choose_end_point">Please choose end point.</floater.string>
-- 
cgit v1.2.3


From c0d44f10f92b43396b6e1bda4da21324e914f030 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 6 Mar 2012 10:41:16 -0800
Subject: Adding the linksets menu option to the build->pathfinding menu.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index bea3037616..1e4a3fc13c 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -957,6 +957,13 @@
               function="Floater.ToggleOrBringToFront"
               parameter="pathfinding_console" />
         </menu_item_call>
+        <menu_item_call
+            label="Linksets..."
+            name="pathfinding_linksets_menu_item">
+          <menu_item_call.on_click
+              function="Floater.ToggleOrBringToFront"
+              parameter="pathfinding_linksets" />
+        </menu_item_call>
         <menu_item_call
             label="Characters..."
             name="pathfinding_characters_menu_item">
-- 
cgit v1.2.3


From 63e8bb875b6aa3ae7789ee01497b848e9090e435 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 7 Mar 2012 19:41:49 -0800
Subject: Adding an enabled check for the linksets menu item based on whether
 the state is frozen.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1e4a3fc13c..fb1709f28d 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -963,6 +963,8 @@
           <menu_item_call.on_click
               function="Floater.ToggleOrBringToFront"
               parameter="pathfinding_linksets" />
+          <menu_item_call.on_enable
+              function="Tools.EnableLinksets" />
         </menu_item_call>
         <menu_item_call
             label="Characters..."
-- 
cgit v1.2.3


From f578181af9cbe3277374578c27487e2e72956079 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 8 Mar 2012 12:34:11 -0800
Subject: PATH-304: Adding functionality to handle the reloading of out-of-date
 navmeshes.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 6c97af2878..75465f1aea 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -15,8 +15,8 @@
   <floater.string name="navmesh_status_library_not_implemented">Cannot find pathing library implementation.</floater.string>
   <floater.string name="navmesh_status_region_not_enabled">This region is not enabled for pathfinding.</floater.string>
   <floater.string name="navmesh_status_downloading">Downloading the navmesh ...</floater.string>
+  <floater.string name="navmesh_status_updating">The navmesh has changed on the server. Downloading the latest navmesh ...</floater.string>
   <floater.string name="navmesh_status_has_navmesh">Navmesh received.</floater.string>
-  <floater.string name="navmesh_status_has_navmesh_downloading">Downloading the latest navmesh ...</floater.string>
   <floater.string name="navmesh_status_error">Unable to download navmesh successfully.</floater.string>
   <floater.string name="pathing_choose_start_and_end_points">Please choose start and end points.</floater.string>
   <floater.string name="pathing_choose_start_point">Please choose start point.</floater.string>
-- 
cgit v1.2.3


From e558f5cb0b8c0937da0f08a1af149afbc497462c Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Mon, 12 Mar 2012 15:04:09 -0400
Subject: path-405: Avatar is no longer frozen when pathing window is up and
 when avatar crosses a region boundary the resident is informed with a message
 in the pathing window.

---
 indra/newview/skins/default/xui/en/floater_pathfinding_console.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 75465f1aea..dd31a71e0f 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -22,6 +22,7 @@
   <floater.string name="pathing_choose_start_point">Please choose start point.</floater.string>
   <floater.string name="pathing_choose_end_point">Please choose end point.</floater.string>
   <floater.string name="pathing_path_valid">Path is shown in blue.</floater.string>
+  <floater.string name="navmesh_update_needed">Region boundary hit, navmesh may not be accurate. Update.</floater.string>
   <text
       height="13"
       word_wrap="true"
-- 
cgit v1.2.3


From c990cc71ce124059a072c7778ac962253bacb199 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 12 Mar 2012 19:18:19 -0700
Subject: PATH-304: Adding an extra state for the pathfinding console to report
 that the status of the navmesh is being checked.

---
 indra/newview/skins/default/xui/en/floater_pathfinding_console.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 75465f1aea..d23d62674f 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -14,6 +14,7 @@
   <floater.string name="navmesh_status_unknown"></floater.string>
   <floater.string name="navmesh_status_library_not_implemented">Cannot find pathing library implementation.</floater.string>
   <floater.string name="navmesh_status_region_not_enabled">This region is not enabled for pathfinding.</floater.string>
+  <floater.string name="navmesh_status_checking_version">Checking the status of the navmesh ...</floater.string>
   <floater.string name="navmesh_status_downloading">Downloading the navmesh ...</floater.string>
   <floater.string name="navmesh_status_updating">The navmesh has changed on the server. Downloading the latest navmesh ...</floater.string>
   <floater.string name="navmesh_status_has_navmesh">Navmesh received.</floater.string>
-- 
cgit v1.2.3


From d4fb7c99febf07b4eb7f3a9d2eab485e356d1439 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 14 Mar 2012 14:09:36 -0700
Subject: PATH-302: Adding in status reporting for the simulator navmesh
 status. Separating the viewer status messaging from the simulator status.

---
 .../default/xui/en/floater_pathfinding_console.xml | 86 +++++++++++++++++-----
 1 file changed, 69 insertions(+), 17 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index aaf94483df..0373305941 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -2,7 +2,7 @@
 <floater
     open_positioning="cascading"
     can_tear_off="false"
-    height="352"
+    height="420"
     layout="topleft"
     name="floater_pathfinding_console"
     help_topic="floater_pathfinding_console"
@@ -11,19 +11,27 @@
     single_instance="true"
     title="Pathfinding edit / test"
     width="456">
-  <floater.string name="navmesh_status_unknown"></floater.string>
-  <floater.string name="navmesh_status_library_not_implemented">Cannot find pathing library implementation.</floater.string>
-  <floater.string name="navmesh_status_region_not_enabled">This region is not enabled for pathfinding.</floater.string>
-  <floater.string name="navmesh_status_checking_version">Checking the status of the navmesh ...</floater.string>
-  <floater.string name="navmesh_status_downloading">Downloading the navmesh ...</floater.string>
-  <floater.string name="navmesh_status_updating">The navmesh has changed on the server. Downloading the latest navmesh ...</floater.string>
-  <floater.string name="navmesh_status_has_navmesh">Navmesh received.</floater.string>
-  <floater.string name="navmesh_status_error">Unable to download navmesh successfully.</floater.string>
+  <floater.string name="navmesh_viewer_status_unknown"></floater.string>
+  <floater.string name="navmesh_viewer_status_library_not_implemented">Cannot find pathing library implementation.</floater.string>
+  <floater.string name="navmesh_viewer_status_region_not_enabled">This region is not enabled for pathfinding.</floater.string>
+  <floater.string name="navmesh_viewer_status_checking_version">Checking the status of the navmesh.</floater.string>
+  <floater.string name="navmesh_viewer_status_downloading">Downloading the navmesh.</floater.string>
+  <floater.string name="navmesh_viewer_status_updating">The navmesh has changed on the server. Downloading the latest navmesh.</floater.string>
+  <floater.string name="navmesh_viewer_status_has_navmesh">Latest navmesh has been downloaded.</floater.string>
+  <floater.string name="navmesh_viewer_status_error">Unable to download navmesh successfully.</floater.string>
+  <floater.string name="navmesh_simulator_status_unknown"></floater.string>
+  <floater.string name="navmesh_simulator_status_region_not_enabled">This region does not expose the navmesh status.</floater.string>
+  <floater.string name="navmesh_simulator_status_pending">Navmesh has pending changes.</floater.string>
+  <floater.string name="navmesh_simulator_status_building">Navmesh is building.</floater.string>
+  <floater.string name="navmesh_simulator_status_some_pending">Some navmesh regions have pending changes.</floater.string>
+  <floater.string name="navmesh_simulator_status_some_building">Some navmesh regions are building.</floater.string>
+  <floater.string name="navmesh_simulator_status_pending_and_building">Some navmesh regions have pending changes and others are building.</floater.string>
+  <floater.string name="navmesh_simulator_status_complete">Navmesh is up-to-date.</floater.string>
   <floater.string name="pathing_choose_start_and_end_points">Please choose start and end points.</floater.string>
   <floater.string name="pathing_choose_start_point">Please choose start point.</floater.string>
   <floater.string name="pathing_choose_end_point">Please choose end point.</floater.string>
   <floater.string name="pathing_path_valid">Path is shown in blue.</floater.string>
-  <floater.string name="navmesh_update_needed">Region boundary hit, navmesh may not be accurate. Update.</floater.string>
+  <floater.string name="navmesh_update_needed">Region boundary hit, navmesh may not be accurate.</floater.string>
   <text
       height="13"
       word_wrap="true"
@@ -56,7 +64,7 @@
       follows="left|top"
       layout="topleft"
       left="35"
-      width="208">
+      width="188">
     Show walkability map:
   </text>
   <combo_box
@@ -157,7 +165,51 @@
         left="0"
         top_pad="5"
         width="200">
-      Status
+      Viewer status
+    </text>
+    <text
+        height="40"
+        word_wrap="true"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left="0"
+        name="pathfinding_viewer_status"
+        top_pad="8"
+        width="200">
+    </text>
+  </panel>
+  <view_border
+      bevel_style="none"
+      follows="top|left"
+      layout="topleft"
+      left="14"
+      height="0"
+      width="200"
+      top_pad="0"
+      visible="true" />
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|top"
+      layout="topleft"
+      height="73"
+      width="200">
+    <text
+        height="13"
+        word_wrap="true"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        layout="topleft"
+        left="0"
+        top_pad="5"
+        width="200">
+      Simulator status
     </text>
     <text
         height="40"
@@ -169,7 +221,7 @@
         follows="left|top"
         layout="topleft"
         left="0"
-        name="pathfinding_status"
+        name="pathfinding_simulator_status"
         top_pad="8"
         width="200">
     </text>
@@ -210,7 +262,7 @@
       layout="topleft"
       left="230"
       top="35"
-      height="305"
+      height="373"
       width="214"
       visible="true" />
   <tab_container
@@ -220,7 +272,7 @@
       name="edit_test_tab_container"
       left="227"
       top="14"
-      height="327"
+      height="395"
       width="218">
     <panel
         border="false"
@@ -294,7 +346,7 @@
           line_spacing.multiple="1.5"
           name="freeze_label"
           top_pad="23"
-          height="26"
+          height="32"
           width="190">
         Prevent object / terrain changes and update the navmesh:
       </text>
@@ -306,7 +358,7 @@
           label="Freeze"
           layout="topleft"
           name="enter_frozen_mode"
-          top_pad="9"
+          top_pad="3"
           width="116"/>
     </panel>
     <panel
-- 
cgit v1.2.3


From d3550dfcd64cfc182fd120338d3e7eb25ac339af Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 19 Mar 2012 16:24:51 -0700
Subject: Adding non-volume status to the pathfinding linkset to restrict
 non-convex linksets from being set to be a material or exclusion volume.

---
 .../xui/en/floater_pathfinding_linksets.xml        |  6 +++--
 .../newview/skins/default/xui/en/notifications.xml | 27 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

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

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 d00b85f5d7..7cd6c32f7e 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -34,6 +34,8 @@
   <floater.string name="linkset_use_dynamic_phantom">Movable phantom</floater.string>
   <floater.string name="linkset_is_terrain">[unmodifiable]</floater.string>
   <floater.string name="linkset_is_restricted_state">[restricted]</floater.string>
+  <floater.string name="linkset_is_non_volume_state">[concave]</floater.string>
+  <floater.string name="linkset_is_restricted_non_volume_state">[restricted,concave]</floater.string>
   <floater.string name="linkset_choose_use">Choose linkset use...</floater.string>
   <panel
       border="false"
@@ -178,7 +180,7 @@
       <scroll_list.columns
           label="Description (root prim)"
           name="description"
-          width="192" />
+          width="166" />
       <scroll_list.columns
           label="Land impact"
           name="land_impact"
@@ -190,7 +192,7 @@
       <scroll_list.columns
           label="Linkset use"
           name="linkset_use"
-          width="210" />
+          width="236" />
       <scroll_list.columns
           label="A %"
           name="a_percent"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5faafecef7..5d6cefbcfb 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7677,6 +7677,33 @@ The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingLinksets_SetLinksetUseMismatchOnVolume"
+   type="alertmodal">
+    Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because of the shape is non-convex.
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Do you wish to proceed?"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingLinksets_SetLinksetUseMismatchOnRestrictedAndVolume"
+   type="alertmodal">
+    Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because of permission restrictions on the linkset.  These linksets will be set to be '[RESTRICTED_TYPE]' instead.
+ Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because of the shape is non-convex. These linksets use types will not change.
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Do you wish to proceed?"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
   <global name="UnsupportedGLRequirements">
 You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_NAME] requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
 
-- 
cgit v1.2.3


From 2f4ad07633264688f5335022f65bfab095c19815 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 20 Mar 2012 17:38:58 -0700
Subject: Cleaning up miscellaneous differences between the pathfinding
 repository and the latest viewer-development.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 9 ---------
 1 file changed, 9 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index fb1709f28d..7fbc5975f3 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -681,7 +681,6 @@
             <menu_item_check.on_enable
              function="Build.Enabled" />
        </menu_item_check>
-	   
        <menu
           create_jump_keys="true"
           label="Select Build Tool"
@@ -1162,14 +1161,6 @@
             <menu_item_call.on_visible
             function="File.VisibleUploadModel"/>
             </menu_item_call>
-          <menu_item_call
-            label="BuildNavMeshTest"
-            layout="topleft"
-            name="BuildNavMesh">
-            <menu_item_call.on_click
-             function="File.UploadNavMesh"
-             parameter="" />
-          </menu_item_call>
 	   <menu_item_call
              label="Bulk (L$[COST] per file)..."
              layout="topleft"
-- 
cgit v1.2.3


From b7aa6803a1f34de0cce9a88f9ecd9c7827c4bb52 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 21 Mar 2012 15:15:59 -0700
Subject: PATH-199: Adding a non-interactive checkbox to the build tools
 floater.

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 2d63c94fe1..0f390217d1 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1354,6 +1354,14 @@ even though the user gets a free copy.
              tool_tip="Causes object to not collide with other objects or avatars"
              top_pad="0"
              width="123" />
+            <check_box
+             height="19"
+             enabled="false"
+             label="Permanent"
+             layout="topleft"
+             name="Permanent Checkbox Ctrl"
+             top_pad="0"
+             width="123" />
 
             <text
              type="string"
-- 
cgit v1.2.3


From b76f036bf6af7ae3e1b8ffb2edeee21911256820 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 23 Mar 2012 14:22:35 -0700
Subject: PATH-199: Alert the user if he/she attempts to terraform while in
 Frozen mode.

---
 indra/newview/skins/default/xui/en/notifications.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 5d6cefbcfb..f6c29cc191 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1276,6 +1276,14 @@ The region [REGION] does not allow terraforming.
   <tag>fail</tag>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="RegionNoTerraformingWhileFrozen"
+   type="alertmodal">
+    You cannot terraform land while in Frozen mode.  Please switch to Unfrozen mode from the menu option Build->Pathfinding->Basic Setup.
+    <tag>fail</tag>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="CannotCopyWarning"
-- 
cgit v1.2.3


From 101099c8702595390f94517e8590c10a0437daf8 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 26 Mar 2012 17:44:28 -0700
Subject: Minor modifications to the pathfinding console floater.

---
 .../skins/default/xui/en/floater_pathfinding_console.xml    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 0373305941..c7b9e2bf19 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -2,7 +2,7 @@
 <floater
     open_positioning="cascading"
     can_tear_off="false"
-    height="420"
+    height="430"
     layout="topleft"
     name="floater_pathfinding_console"
     help_topic="floater_pathfinding_console"
@@ -75,7 +75,7 @@
       top_pad="8"
       width="156">
     <combo_box.item
-        label="None"
+        label="Do not show"
         name="show_heatmap_mode_none"
         value="0" />
     <combo_box.item
@@ -245,8 +245,8 @@
       layout="topleft"
       left="14"
       top_pad="18"
-      width="105">
-    Lost characters?
+      width="250">
+    Lost characters? Bad performance?
   </text>
   <button
       follows="left|top"
@@ -255,6 +255,7 @@
       layout="topleft"
       name="view_characters_floater"
       left_pad="0"
+      top_pad="-17"
       width="96"/>
   <view_border
       bevel_style="none"
@@ -262,7 +263,7 @@
       layout="topleft"
       left="230"
       top="35"
-      height="373"
+      height="344"
       width="214"
       visible="true" />
   <tab_container
@@ -272,7 +273,7 @@
       name="edit_test_tab_container"
       left="227"
       top="14"
-      height="395"
+      height="366"
       width="218">
     <panel
         border="false"
-- 
cgit v1.2.3


From 083c81f53f79f53aafdb380a178be081ae461018 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 27 Mar 2012 13:38:51 -0700
Subject: PATH-433: Pumping the character type selection from the console
 floater into the generatePath call of the pathing library.

---
 .../default/xui/en/floater_pathfinding_console.xml | 64 ++++++++--------------
 1 file changed, 24 insertions(+), 40 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index c7b9e2bf19..a672ecce8e 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -30,7 +30,7 @@
   <floater.string name="pathing_choose_start_and_end_points">Please choose start and end points.</floater.string>
   <floater.string name="pathing_choose_start_point">Please choose start point.</floater.string>
   <floater.string name="pathing_choose_end_point">Please choose end point.</floater.string>
-  <floater.string name="pathing_path_valid">Path is shown in blue.</floater.string>
+  <floater.string name="pathing_path_valid">Path is shown in olive green.</floater.string>
   <floater.string name="navmesh_update_needed">Region boundary hit, navmesh may not be accurate.</floater.string>
   <text
       height="13"
@@ -420,53 +420,38 @@
           follows="left|top"
           layout="topleft"
           left_pad="-165"
-          top_pad="9"
+          top_pad="13"
           width="190">
         Character type
       </text>
-      <radio_group
+      <combo_box
           follows="top|left"
-          height="20"
           layout="topleft"
-          left_delta="0"
-          name="character_type"
-          top_delta="18"
-          value="1"
-          width="190">
-        <radio_item
+          height="19"
+          width="156"
+          top_pad="5"
+          name="path_character_type">
+        <combo_box.item
+            label="None"
+            name="path_character_type_none"
+            value="0" />
+        <combo_box.item
             label="A"
-            height="14"
-            width="30"
-            value="1"
-            name="character_type_a"/>
-        <radio_item
+            name="path_character_type_a"
+            value="1" />
+        <combo_box.item
             label="B"
-            height="14"
-            width="30"
-            layout="topleft"
-            top="4"
-            left="50"
-            value="2"
-            name="character_type_b"/>
-        <radio_item
+            name="path_character_type_b"
+            value="2" />
+        <combo_box.item
             label="C"
-            height="14"
-            width="30"
-            layout="topleft"
-            top="4"
-            left="100"
-            value="3"
-            name="character_type_c"/>
-        <radio_item
+            name="path_character_type_c"
+            value="3" />
+        <combo_box.item
             label="D"
-            height="14"
-            width="30"
-            layout="topleft"
-            top="4"
-            left="150"
-            value="4"
-            name="character_type_d"/>
-      </radio_group>
+            name="path_character_type_d"
+            value="4" />
+      </combo_box>
       <text
           height="14"
           word_wrap="true"
@@ -476,7 +461,6 @@
           length="1"
           follows="left|top"
           layout="topleft"
-          left_pad="-190"
           top_pad="12"
           width="190">
         Ctrl-click to select start point.
-- 
cgit v1.2.3


From 473da43c1bbc20245b3a74c1adc7c92f91d25807 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 27 Mar 2012 19:05:29 -0700
Subject: Refactoring the characters floater code.

---
 .../xui/en/floater_pathfinding_characters.xml      | 317 +++++++++++----------
 .../default/xui/en/floater_pathfinding_console.xml |   1 +
 .../xui/en/floater_pathfinding_linksets.xml        |  13 +-
 3 files changed, 174 insertions(+), 157 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
index e9d58c7a33..f643913b6d 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -15,165 +15,180 @@
     single_instance="true"
     title="Pathfinding characters">
   <floater.string name="characters_messaging_initial"></floater.string>
-  <floater.string name="characters_messaging_fetch_starting">Building query for pathfinding characters ...</floater.string>
-  <floater.string name="characters_messaging_fetch_inprogress">Querying for pathfinding characters ...</floater.string>
-  <floater.string name="characters_messaging_fetch_inprogress_multi_request">Querying for pathfinding characters (already in progress) ...</floater.string>
-  <floater.string name="characters_messaging_fetch_received">Loading pathfinding characters data from response ...</floater.string>
-  <floater.string name="characters_messaging_fetch_error">Error detected while querying for pathfinding characters</floater.string>
-  <floater.string name="characters_messaging_complete_none_found">No pathfinding characters</floater.string>
-  <floater.string name="characters_messaging_complete_available">[NUM_SELECTED] characters selected out of [NUM_TOTAL]</floater.string>
-  <floater.string name="characters_messaging_service_not_available">Required capability is not available in current region</floater.string>
+  <floater.string name="characters_messaging_get_inprogress">Querying for pathfinding characters ...</floater.string>
+  <floater.string name="characters_messaging_get_error">Error detected while querying for pathfinding characters.</floater.string>
+  <floater.string name="characters_messaging_complete_none_found">No pathfinding characters.</floater.string>
+  <floater.string name="characters_messaging_complete_available">[NUM_SELECTED] characters selected out of [NUM_TOTAL].</floater.string>
+  <floater.string name="characters_messaging_not_enabled">This region is not enabled for pathfinding.</floater.string>
   <floater.string name="character_cpu_time">[CPU_TIME] µs</floater.string>
-  <scroll_list
-      column_padding="0"
-      draw_heading="true"
-      follows="all"
-      height="135"
-      layout="topleft"
-      left="18"
-      top="10"
-      multi_select="true"
-      name="pathfinding_characters"
-      width="600">
-    <scroll_list.columns
-        label="Name"
-        name="name"
-        dynamic_width="true" />
-    <scroll_list.columns
-        label="Description"
-        name="description"
-        width="172" />
-    <scroll_list.columns
-        label="Owner"
-        name="owner"
-        width="141" />
-    <scroll_list.columns
-        label="CPU"
-        name="cpu_time"
-        width="60" />
-    <scroll_list.columns
-        label="Altitude"
-        name="altitude"
-        width="64" />
-  </scroll_list>
-  <text
-      height="26"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|bottom"
-      layout="topleft"
-      name="characters_status"
-      top="161"
-      width="240">
-    Characters:
-  </text>
-  <button
-      follows="right|bottom"
-      height="21"
-      label="Refresh list"
-      layout="topleft"
-      name="refresh_characters_list"
-      top="161"
-      left="257"
-      width="115"/>
-  <button
-      follows="right|bottom"
-      height="21"
-      label="Select all"
-      layout="topleft"
-      name="select_all_characters"
-      top="161"
-      left="378"
-      width="115"/>
-  <button
-      follows="right|bottom"
-      height="21"
-      label="Select none"
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|top|right|bottom"
       layout="topleft"
-      name="select_none_characters"
-      top="161"
-      left="502"
-      width="115"/>
+      height="191"
+      width="635">
+    <scroll_list
+        column_padding="0"
+        draw_heading="true"
+        follows="all"
+        height="135"
+        layout="topleft"
+        left="18"
+        top_pad="10"
+        multi_select="true"
+        name="pathfinding_characters"
+        width="600">
+      <scroll_list.columns
+          label="Name"
+          name="name"
+          dynamic_width="true" />
+      <scroll_list.columns
+          label="Description"
+          name="description"
+          width="172" />
+      <scroll_list.columns
+          label="Owner"
+          name="owner"
+          width="141" />
+      <scroll_list.columns
+          label="CPU"
+          name="cpu_time"
+          width="60" />
+      <scroll_list.columns
+          label="Altitude"
+          name="altitude"
+          width="64" />
+    </scroll_list>
+    <text
+        height="26"
+        word_wrap="true"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        follows="left|bottom|right"
+        layout="topleft"
+        name="characters_status"
+        top_pad="17"
+        width="238">
+      Characters:
+    </text>
+    <button
+        follows="right|bottom"
+        height="21"
+        label="Refresh list"
+        layout="topleft"
+        name="refresh_characters_list"
+        top_pad="-29"
+        left_pad="0"
+        width="115"/>
+    <button
+        follows="right|bottom"
+        height="21"
+        label="Select all"
+        layout="topleft"
+        name="select_all_characters"
+        top_pad="-21"
+        left_pad="8"
+        width="115"/>
+    <button
+        follows="right|bottom"
+        height="21"
+        label="Select none"
+        layout="topleft"
+        name="select_none_characters"
+        top_pad="-21"
+        left_pad="8"
+        width="115"/>
+  </panel>
   <view_border
       bevel_style="none"
       follows="left|right|bottom"
       height="0"
       layout="topleft"
       name="horiz_separator"
-      top="196"
-      left="20"
+      top_pad="0"
+      left="18"
       width="600"/>
-  <text
-      height="13"
-      word_wrap="false"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      text_readonly_color="LabelDisabledColor"
-      length="1"
-      follows="left|bottom"
-      layout="topleft"
-      name="actions_label"
-      top_pad="12"
-      width="242">
-    Actions on selected characters:
-  </text>
-  <check_box
-      height="19"
-      follows="left|bottom"
-      label="Show beacon"
-      layout="topleft"
-      name="show_beacon"
-      top="208"
-      left="259"
-      width="90" />
-  <button
-      follows="left|bottom"
-      height="22"
-      label="Take"
-      layout="topleft"
-      name="take_characters"
-      top="232"
-      left="17"
-      width="94"/>
-  <button
-      follows="left|bottom"
-      height="22"
-      label="Take copy"
-      layout="topleft"
-      name="take_copy_characters"
-      top="232"
-      left="119"
-      width="94"/>
-  <button
-      follows="left|bottom"
-      height="22"
-      label="Return"
-      layout="topleft"
-      name="return_characters"
-      top="233"
-      left="220"
-      width="94"/>
-  <button
-      follows="left|bottom"
-      height="22"
-      label="Delete"
-      layout="topleft"
-      name="delete_characters"
-      top="233"
-      left="322"
-      width="94"/>
-  <button
-      follows="left|bottom"
-      height="22"
-      label="Teleport me to it"
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|right|bottom"
       layout="topleft"
-      name="teleport_to_character"
-      tool_tip="Enabled only when one character is selected."
-      top="233"
-      left="420"
-      width="159"/>
+      left="0"
+      height="67"
+      width="635">
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        length="1"
+        follows="left|bottom|right"
+        layout="topleft"
+        name="actions_label"
+        left="18"
+        top_pad="8"
+        width="242">
+      Actions on selected characters:
+    </text>
+    <check_box
+        height="19"
+        follows="left|bottom"
+        label="Show beacon"
+        layout="topleft"
+        name="show_beacon"
+        top_pad="-16"
+        left_pad="0"
+        width="90" />
+    <button
+        follows="left|bottom"
+        height="22"
+        label="Take"
+        layout="topleft"
+        name="take_characters"
+        top_pad="9"
+        left="18"
+        width="94"/>
+    <button
+        follows="left|bottom"
+        height="22"
+        label="Take copy"
+        layout="topleft"
+        name="take_copy_characters"
+        top_pad="-22"
+        left_pad="6"
+        width="94"/>
+    <button
+        follows="left|bottom"
+        height="22"
+        label="Return"
+        layout="topleft"
+        name="return_characters"
+        top_pad="-22"
+        left_pad="6"
+        width="94"/>
+    <button
+        follows="left|bottom"
+        height="22"
+        label="Delete"
+        layout="topleft"
+        name="delete_characters"
+        top_pad="-22"
+        left_pad="6"
+        width="94"/>
+    <button
+        follows="left|bottom"
+        height="22"
+        label="Teleport me to it"
+        layout="topleft"
+        name="teleport_to_character"
+        tool_tip="Enabled only when one character is selected."
+        top_pad="-22"
+        left_pad="6"
+        width="159"/>
+  </panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index a672ecce8e..6cd07ef7b6 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -60,6 +60,7 @@
       use_ellipses="false"
       type="string"
       text_color="LabelTextColor"
+      text_readonly_color="LabelDisabledColor"
       length="1"
       follows="left|top"
       layout="topleft"
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 7cd6c32f7e..cefef1c509 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -16,11 +16,11 @@
     title="Pathfinding linksets">
   <floater.string name="linksets_messaging_initial"></floater.string>
   <floater.string name="linksets_messaging_get_inprogress">Querying for pathfinding linksets ...</floater.string>
-  <floater.string name="linksets_messaging_get_error">Error detected while querying for pathfinding linksets</floater.string>
+  <floater.string name="linksets_messaging_get_error">Error detected while querying for pathfinding linksets.</floater.string>
   <floater.string name="linksets_messaging_set_inprogress">Modifying selected pathfinding linksets ...</floater.string>
-  <floater.string name="linksets_messaging_set_error">Error detected while modifying selected pathfinding linksets</floater.string>
-  <floater.string name="linksets_messaging_complete_none_found">No pathfinding linksets</floater.string>
-  <floater.string name="linksets_messaging_complete_available">[NUM_SELECTED] linksets selected out of [NUM_TOTAL]</floater.string>
+  <floater.string name="linksets_messaging_set_error">Error detected while modifying selected pathfinding linksets.</floater.string>
+  <floater.string name="linksets_messaging_complete_none_found">No pathfinding linksets.</floater.string>
+  <floater.string name="linksets_messaging_complete_available">[NUM_SELECTED] linksets selected out of [NUM_TOTAL].</floater.string>
   <floater.string name="linksets_messaging_not_enabled">This region is not enabled for pathfinding.</floater.string>
   <floater.string name="linkset_terrain_name">[Terrain]</floater.string>
   <floater.string name="linkset_terrain_description">--</floater.string>
@@ -217,7 +217,7 @@
         type="string"
         text_color="LabelTextColor"
         length="1"
-        follows="left|bottom"
+        follows="left|bottom|right"
         layout="topleft"
         name="linksets_status"
         top_pad="17"
@@ -275,13 +275,14 @@
         use_ellipses="false"
         type="string"
         text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
         length="1"
         left="18"
         follows="left|bottom|right"
         layout="topleft"
         top_pad="8"
         width="580">
-      Actions on selected linksets (If a linkset is removed from the world, its attributes will be lost):
+      Actions on selected linksets (If a linkset is removed from the world, its attributes may be lost):
     </text>
     <check_box
         height="19"
-- 
cgit v1.2.3


From 175797713c910d350d71249003910493aaf0dd67 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@lindenlab.com>
Date: Wed, 28 Mar 2012 12:47:05 -0700
Subject: Minor typo fixes in LSL tooltips. Reviewed with Stinson Linden.

---
 indra/newview/skins/default/xui/en/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 749f0e9ad9..af3c4eab24 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -787,9 +787,9 @@ Sets the script timer to zero
 float llGetAndResetTime()
 Returns the script time in seconds and then resets the script timer to zero
 	</string>
-	<string name="LSLTipText_llSoplayund" translate="false">
+	<string name="LSLTipText_llSound" translate="false">
 llSound(string sound, float volume, integer queue, integer loop)
-Plays sound at volume and whether it should loop or not
+Plays sound at volume and whether it should loop or not.
 	</string>
 	<string name="LSLTipText_llPlaySound" translate="false">
 llPlaySound(string sound, float volume)
@@ -1665,7 +1665,7 @@ Returns a list containing results of the sent query
 	</string>
 	<string name="LSLTipText_llModPow" translate="false">
 integer llModPow(integer a, integer b, integer c)
-Returns a raised to the b power, mod c. ( (a**b)%c )
+Returns a raised to the b power, mod c. ( (a**b)%c )
 b is capped at 0xFFFF (16 bits).
 	</string>
 	<string name="LSLTipText_llGetInventoryType" translate="false">
-- 
cgit v1.2.3


From 6d530eb30bfce7d4896828e977c108a20138a10e Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@lindenlab.com>
Date: Wed, 28 Mar 2012 14:25:48 -0700
Subject: Adding some missing LSL tooltips.  Still needs work, but is progress.
 Reviewed with Stinson Linden.

---
 indra/newview/skins/default/xui/en/strings.xml | 209 ++++++++++++++++++++-----
 1 file changed, 170 insertions(+), 39 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index af3c4eab24..61935c77c3 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -669,7 +669,7 @@ Sets the texture u &amp; v scales for the chosen face or ALL_SIDES
 	</string>
 	<string name="LSLTipText_llOffsetTexture" translate="false">
 llOffsetTexture(float u, float v, integer face)
-Sets the texture u &amp; v offsets for the chosen face or ALL_SIDES
+Sets the texture u  &amp; v offsets for the chosen face or ALL_SIDES
 	</string>
 	<string name="LSLTipText_llRotateTexture" translate="false">
 llRotateTexture(float rotation, integer face)
@@ -1778,10 +1778,10 @@ integer llGetParcelMaxPrims(vector pos, integer sim_wide)
 Returns the maximum number of prims allowed on the parcel at pos
 	</string>
 	<string name="LSLTipText_llGetParcelDetails" translate="false">
-    list llGetParcelDetails(vector pos, list params)
-    Returns the parcel details specified in params for the parcel at pos.
-    Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _SEE_AVATARS
-  </string>
+list llGetParcelDetails(vector pos, list params)
+Returns the parcel details specified in params for the parcel at pos.
+Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _SEE_AVATARS
+	</string>
 	<string name="LSLTipText_llSetLinkPrimitiveParams" translate="false">
 llSetLinkPrimitiveParams(integer linknumber, list rules)
 Sets primitive parameters for linknumber based on rules
@@ -1870,71 +1870,202 @@ Releases the specified URL, it will no longer be usable
 	<string name="LSLTipText_llHTTPResponse" translate="false">
 llHTTPResponse(key request_id, integer status, string body)
 Responds to request_id with status and body
-  </string>
+	</string>
 	<string name="LSLTipText_llGetHTTPHeader" translate="false">
 string llGetHTTPHeader(key request_id, string header)
 Returns the value for header for request_id
 	</string>
-  <string name="LSLTipText_llSetPrimMediaParams" translate="false">
+	<string name="LSLTipText_llSetPrimMediaParams" translate="false">
 llSetPrimMediaParams(integer face, list params)
 Sets the media params for a particular face on an object. If media is not already on this object, add it.
 List is a set of name/value pairs in no particular order.  Params not specified are unchanged, or if new media is added then set to the default specified.
 The possible names are below, along with the types of values and what they mean.
-  </string>
-  <string name="LSLTipText_llGetPrimMediaParams" translate="false">
+	</string>
+	<string name="LSLTipText_llGetPrimMediaParams" translate="false">
 list llGetPrimMediaParams(integer face, list params)
 Returns the media params for a particular face on an object, given the desired list of names, in the order requested.
 (Returns an empty list if no media exists on the face.)
-  </string>
-  <string name="LSLTipText_llClearPrimMedia" translate="false">
+	</string>
+	<string name="LSLTipText_llClearPrimMedia" translate="false">
 llClearPrimMedia(integer face)
 Clears (deletes) the media and all params from the given face.
-  </string>
-<string name="LSLTipText_llSetLinkPrimitiveParamsFast" translate="false">
+	</string>
+	<string name="LSLTipText_llSetLinkPrimitiveParamsFast" translate="false">
 llSetLinkPrimitiveParamsFast(integer linknumber,list rules)
 Set primitive parameters for linknumber based on rules.
-</string>
-<string name="LSLTipText_llGetLinkPrimitiveParams" translate="false">
+	</string>
+	<string name="LSLTipText_llGetLinkPrimitiveParams" translate="false">
 llGetLinkPrimitiveParams(integer linknumber,list rules)
 Get primitive parameters for linknumber based on rules.
-</string>
-<string name="LSLTipText_llLinkParticleSystem" translate="false">
+	</string>
+	<string name="LSLTipText_llLinkParticleSystem" translate="false">
 llLinkParticleSystem(integer linknumber,list rules)
 Creates a particle system based on rules.  Empty list removes particle system from object.
 List format is [ rule1, data1, rule2, data2 . . . rulen, datan ].
-</string>
-<string name="LSLTipText_llSetLinkTextureAnim" translate="false">
+	</string>
+	<string name="LSLTipText_llSetLinkTextureAnim" translate="false">
 llSetLinkTextureAnim(integer link, integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate)
-Animate the texture on the specified prim's face/faces.
-</string>
-<string name="LSLTipText_llGetLinkNumberOfSides" translate="false">
+Animate the texture on the specified prim&apos;s face/faces.
+	</string>
+	<string name="LSLTipText_llGetLinkNumberOfSides" translate="false">
 integer llGetLinkNumberOfSides(integer link)
 Returns the number of sides of the specified linked prim.
-</string>
-<string name="LSLTipText_llGetUsername" translate="false">
+	</string>
+	<string name="LSLTipText_llGetUsername" translate="false">
 string llGetUsername(key id)
 Returns the single-word username of an avatar, iff the avatar is in the current region, otherwise the empty string.
-</string>
-<string name="LSLTipText_llRequestUsername" translate="false">
+	</string>
+	<string name="LSLTipText_llRequestUsername" translate="false">
 key llRequestUsername(key id)
 Requests single-word username of an avatar.  When data is available the dataserver event will be raised.
-</string>
-<string name="LSLTipText_llGetDisplayName" translate="false">
-  string llGetDisplayName(key id)
-  Returns the name of an avatar, iff the avatar is in the current simulator, and the name has been cached, otherwise the same as llGetUsername.  Use llRequestDisplayName if you absolutely must have the display name.
-</string>
-<string name="LSLTipText_llRequestDisplayName" translate="false">
+	</string>
+	<string name="LSLTipText_llGetDisplayName" translate="false">
+string llGetDisplayName(key id)
+Returns the name of an avatar, iff the avatar is in the current simulator, and the name has been cached, otherwise the same as llGetUsername.  Use llRequestDisplayName if you absolutely must have the display name.
+	</string>
+	<string name="LSLTipText_llRequestDisplayName" translate="false">
 key llRequestDisplayName(key id)
 Requests name of an avatar.  When data is available the dataserver event will be raised.
-</string>
-<string name="LSLTipText_llRegionSayTo" translate="false">
-llRegionSayTo(key target, integer channel, string msg)
-Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region
-</string>
-<string name="LSLTipText_llGetEnv" translate="false">
+	</string>
+	<string name="LSLTipText_llGetEnv" translate="false">
 llGetEnv(string name)
 Returns a string with the requested data about the region
-</string>
+	</string>
+	<string name="LSLTipText_llCastRay" translate="false">
+llCastRay(vector start, vector end, list params)
+Casts a ray into the physics world from &apos;start&apos; to &apos;end&apos; and returns data according to details in params.
+	</string>
+	<string name="LSLTipText_llRegionSayTo" translate="false">
+llRegionSayTo(key target, integer channel, string msg)
+Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region.
+	</string>
+	<string name="LSLTipText_llGetSPMaxMemory" translate="false">
+integer llGetSPMaxMemory()
+Returns the maximum used memory for the current script. Only valid after using PROFILE_SCRIPT_MEMORY. Non-mono scripts always use 16k.
+	</string>
+	<string name="LSLTipText_llGetUsedMemory" translate="false">
+integer llGetUsedMemory()
+Returns the current used memory for the current script. Non-mono scripts always use 16k.
+	</string>
+	<string name="LSLTipText_llScriptProfiler" translate="false">
+llScriptProfiler(integer flags)
+Enabled or disables script profiling options. Currently only supports PROFILE_SCRIPT_MEMORY (mono only) and PROFILE_NONE.
+MAY SIGNIFICANTLY REDUCE SCRIPT PERFORMANCE!
+	</string>
+	<string name="LSLTipText_llSetMemoryLimit" translate="false">
+integer llSetMemoryLimit(integer mem)
+	</string>
+	<string name="LSLTipText_llGetMemoryLimit" translate="false">
+integer llGetMemoryLimit()
+	</string>
+	<string name="LSLTipText_llSetLinkMedia" translate="false">
+llSetLinkMedia(integer link, integer face, list params)
+Set the media params for a particular face on linked prim.  List is a set of name/value pairs (in no particular order). The possible names are below, along with the types of values and what they mean.  If media is not already on this object, add it. Params not specified are unchanged, or if new media is added set to the default specified.
+	</string>
+	<string name="LSLTipText_llGetLinkMedia" translate="false">
+list llGetLinkMedia(integer link, integer face, list params)
+Get the media params for a particular face on linked prim, given the desired list of names. Returns a list of values in the order requested.  Returns an empty list if no media exists on the face.
+	</string>
+	<string name="LSLTipText_llClearLinkMedia" translate="false">
+llClearLinkMedia(integer link, integer face)
+Clears (deletes) the media and all params from the given face on linked prim.
+	</string>
+	<string name="LSLTipText_llSetContentType" translate="false">
+llSetContentType(key id, integer content_type)
+	</string>
+	<string name="LSLTipText_llLinkSitTarget" translate="false">
+llLinkSitTarget(integer link, vector offset, rotation rot)
+Set the sit location for this object (if offset == &lt;0,0,0&gt; clear it)
+	</string>
+	<string name="LSLTipText_llAvatarOnLinkSitTarget" translate="false">
+key llAvatarOnLinkSitTarget(integer link)
+If an avatar is sitting on the sit target, return the avatar&apos;s key, NULL_KEY otherwise
+	</string>
+	<string name="LSLTipText_llSetLinkCamera" translate="false">
+llSetLinkCamera(integer link, vector eye, vector at)
+	</string>
+	<string name="LSLTipText_llSetVelocity" translate="false">
+llSetVelocity(vector velocity, integer local)
+Sets an objects velocity, in local coords if local == TRUE (if the script is physical)
+	</string>
+	<string name="LSLTipText_llSetAngularVelocity" translate="false">
+llSetAngularVelocity(vector angular_velocity, integer local)
+Sets an objects angular velocity, in local coords if local == TRUE (if the script is physical)
+	</string>
+	<string name="LSLTipText_llSetPhysicsMaterial" translate="false">
+llSetPhysicsMaterial(integer flags, float gravity_multiplier, float restitution, float friction, float density )
+Sets the requested attributes of the root object&apos;s physics material.
+	</string>
+	<string name="LSLTipText_llGetPhysicsMaterial" translate="false">
+llGetPhysicsMaterial() returns the gravity multiplier, restitution, friction, and density of the linkset as a list in that order.
+	</string>
+	<string name="LSLTipText_llGetMassMKS" translate="false">
+llGetMassMKS() returns the mass of the linkset in kilograms.
+	</string>
+	<string name="LSLTipText_llGenerateKey" translate="false">
+llGenerateKey()
+Retun a unique generated key
+	</string>
+	<string name="LSLTipText_llSetKeyframedMotion" translate="false">
+llSetKeyframedMotion(list keyframes, list options)
+Requests that a nonphysical object be keyframed according to keyframe list.
+	</string>
+	<string name="LSLTipText_llTransferLindenDollars" translate="false">
+key llTransferLindenDollars(key destination, integer amount)
+Transfer amount of linden dollars (L$) from script owner to destination. Returns a key to a corresponding transaction_result event for the success of the transfer.
+	</string>
+	<string name="LSLTipText_llGetParcelMusicURL" translate="false">
+string llGetParcelMusicURL()
+Gets the streaming audio URL for the parcel of land on which the object is located.
+	</string>
+	<string name="LSLTipText_llSetRegionPos" translate="false">
+integer llSetRegionPos(vector pos)
+Sets the position anywhere within the region (if the object isn&apos;t physical)
+	</string>
+	<string name="LSLTipText_llNavigateTo" translate="false">
+llNavigateTo(vector point, list options)
+For AI Character: Navigate to destination.
+	</string>
+	<string name="LSLTipText_llCreateCharacter" translate="false">
+llCreateCharacter(list options)
+Convert linkset to AI Character which can navigate the world.
+	</string>
+	<string name="LSLTipText_llPursue" translate="false">
+llPursue(key target, list options)
+For AI Character: Chase after a target.
+	</string>
+	<string name="LSLTipText_llWanderWithin" translate="false">
+llWanderWithin(vector center, float radius, list options)
+For AI Character: Wander within a specified volume.
+	</string>
+	<string name="LSLTipText_llFleeFrom" translate="false">
+llFleeFrom(vector source, float radius, list options)
+For AI Character: Flee from a point.
+	</string>
+	<string name="LSLTipText_llPatrolPoints" translate="false">
+llPatrolPoints(list points, list options)
+For AI Character: Patrol a list of points.
+	</string>
+	<string name="LSLTipText_llExecCharacterCmd" translate="false">
+llExecCharacterCmd(integer cmd, list options)
+For AI Character: Execute a character command.
+	</string>
+	<string name="LSLTipText_llDeleteCharacter" translate="false">
+llDeleteCharacter()
+Convert linkset from AI Character to Physics object.
+	</string>
+	<string name="LSLTipText_llUpdateCharacter" translate="false">
+llUpdateCharacter(list options)
+Change the AI Character&apos;s settings.
+	</string>
+	<string name="LSLTipText_llEvade" translate="false">
+llEvade(key target, list options)
+For AI Character: Evade a specified target.
+	</string>
+	<string name="LSLTipText_llGetClosestNavPoint" translate="false">
+list llGetClosestNavPoint(vector point, list options)
+For AI Character: Get the closest navigable point to the point provided.
+	</string>
 
 
   <!-- Avatar busy/away mode -->
-- 
cgit v1.2.3


From 9a5b0a343fa4e8a684119cd55f7e80b07921c49a Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 29 Mar 2012 11:59:25 -0700
Subject: Removing the scrolllist elements from the tab stops.

---
 indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml | 1 +
 indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml   | 1 +
 2 files changed, 2 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
index f643913b6d..16b4a70b93 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -36,6 +36,7 @@
         layout="topleft"
         left="18"
         top_pad="10"
+        tab_stop="false"
         multi_select="true"
         name="pathfinding_characters"
         width="600">
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 cefef1c509..1349bff441 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -170,6 +170,7 @@
         layout="topleft"
         left="18"
         top_pad="15"
+        tab_stop="false"
         multi_select="true"
         name="pathfinding_linksets"
         width="910">
-- 
cgit v1.2.3


From e07af906968d3aec49cd04a28d6439bc1759759f Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 29 Mar 2012 12:13:11 -0700
Subject: Updating the test path and universe colors based on Leo's direction.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 6cd07ef7b6..adcd7f0fbf 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -30,7 +30,7 @@
   <floater.string name="pathing_choose_start_and_end_points">Please choose start and end points.</floater.string>
   <floater.string name="pathing_choose_start_point">Please choose start point.</floater.string>
   <floater.string name="pathing_choose_end_point">Please choose end point.</floater.string>
-  <floater.string name="pathing_path_valid">Path is shown in olive green.</floater.string>
+  <floater.string name="pathing_path_valid">Path is shown in orange.</floater.string>
   <floater.string name="navmesh_update_needed">Region boundary hit, navmesh may not be accurate.</floater.string>
   <text
       height="13"
-- 
cgit v1.2.3


From f90bcb3a55a0e61f3dbf068c3ddea86b6d5f519f Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 29 Mar 2012 15:00:29 -0700
Subject: PATH-442: BUGFIX Disabling the phantom flag in the Build Tools
 floater for character objects.

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 0f390217d1..528d2a7064 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1362,15 +1362,23 @@ even though the user gets a free copy.
              name="Permanent Checkbox Ctrl"
              top_pad="0"
              width="123" />
+        <check_box
+         height="19"
+         enabled="false"
+         label="Character"
+         layout="topleft"
+         name="Character Checkbox Ctrl"
+         top_pad="0"
+         width="123" />
 
-            <text
+        <text
              type="string"
              length="1"
              follows="left|top"
              height="10"
              layout="topleft"
              name="label position"
-             top_pad="10"
+             top_pad="5"
              width="121">
                 Position (meters)
             </text>
-- 
cgit v1.2.3


From fcda925072c51de749e6b35b3863f29d8be3eaa6 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 29 Mar 2012 18:07:40 -0700
Subject: PATH-450: BUGFIX Ensuring that permanent objects cannot be linked in
 frozen mode.  Displaying a modal notification if user attempts.

---
 indra/newview/skins/default/xui/en/floater_tools.xml       |  8 ++++++++
 indra/newview/skins/default/xui/en/notifications.xml       | 10 ++++++++++
 indra/newview/skins/default/xui/en/sidepanel_task_info.xml |  8 ++++++++
 3 files changed, 26 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 528d2a7064..0a90cea886 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -876,6 +876,14 @@
              name="text modify info 4">
                 You can't modify these objects
             </panel.string>
+            <panel.string
+             name="text modify info 5">
+                You can't modify this object in frozen mode
+            </panel.string>
+            <panel.string
+             name="text modify info 6">
+                You can't modify these objects in frozen mode
+            </panel.string>
             <panel.string
              name="text modify warning">
                 You must select entire object to set permissions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f6c29cc191..e1a7c6309d 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1488,6 +1488,16 @@ Please make sure none are locked, and that you own all of them.
   <tag>fail</tag>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="CannotLinkPermanent"
+   type="alertmodal">
+Unable to link permanent objects in frozen mode.
+
+Please switch to unfrozen mode from the menu option Build->Pathfinding->Basic Setup.
+    <tag>fail</tag>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="CannotLinkDifferentOwners"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
index 6600339ad7..8a823e8278 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -30,6 +30,14 @@
              name="text modify info 4">
                 You can't modify these objects
             </panel.string>
+            <panel.string
+             name="text modify info 5">
+                You can't modify this object in frozen mode
+            </panel.string>
+            <panel.string
+             name="text modify info 6">
+                You can't modify these objects in frozen mode
+            </panel.string>
             <panel.string
              name="text modify warning">
                 This object has linked parts
-- 
cgit v1.2.3


From 817f1629bdafd6c28efa2a868a7aad75eb8a9514 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 3 Apr 2012 02:52:34 -0500
Subject: Pathfinding visualization WIP -- add many controls for x-ray render,
 add lighting, and better combat z-fighting and noise from wireframes and
 overlays

---
 .../newview/skins/default/xui/en/floater_pathfinding_console.xml  | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index adcd7f0fbf..f64349f47e 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -139,6 +139,14 @@
       name="show_world"
       top_pad="4"
       width="90" />
+  <check_box
+      height="19"
+      label="X-Ray"
+      layout="topleft"
+      left="14"
+      name="x-ray"
+      top_pad="4"
+      width="90" />
   <view_border
       bevel_style="none"
       follows="top|left"
-- 
cgit v1.2.3


From edf8058f0125e3295ac8d59034aa7952ed930a47 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 3 Apr 2012 17:57:05 -0500
Subject: Fix pathfinding console floater size to fit extra checkbox

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index f64349f47e..6c294d2f59 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -2,7 +2,7 @@
 <floater
     open_positioning="cascading"
     can_tear_off="false"
-    height="430"
+    height="448"
     layout="topleft"
     name="floater_pathfinding_console"
     help_topic="floater_pathfinding_console"
-- 
cgit v1.2.3


From 081977308d6576f100df4bda03e6928faf520bc5 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 3 Apr 2012 18:41:31 -0700
Subject: PATH-454: BUGFIX Adding a notification when switching a permanent
 object to Flexible Path.

---
 indra/newview/skins/default/xui/en/notifications.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e1a7c6309d..3b03bc0aed 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7722,6 +7722,19 @@ The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingLinksets_ChangeToFlexiblePath"
+   type="alertmodal">
+    The selected object is marked as permanent and is included in the navmesh.  Setting the object to be a Flexible Path will unset the permanent value and remove the object from the navmesh.  Do you wish to proceed?
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Do you wish to proceed?"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
   <global name="UnsupportedGLRequirements">
 You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_NAME] requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
 
-- 
cgit v1.2.3


From 87fb36df1aa2bce666371f3d78f6c64b75e262b9 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 4 Apr 2012 12:46:46 -0700
Subject: PATH-492: BUGFIX Disabling the pathfinding submenu options on
 non-pathfinding enabled regions.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 492944cccb..ad02beff7a 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -948,6 +948,8 @@
           <menu_item_call.on_click
               function="Floater.ToggleOrBringToFront"
               parameter="pathfinding_basic" />
+          <menu_item_call.on_enable
+              function="Tools.EnablePathfinding" />
         </menu_item_call>
         <menu_item_call
             label="Edit / test..."
@@ -955,6 +957,8 @@
           <menu_item_call.on_click
               function="Floater.ToggleOrBringToFront"
               parameter="pathfinding_console" />
+          <menu_item_call.on_enable
+              function="Tools.EnablePathfinding" />
         </menu_item_call>
         <menu_item_call
             label="Linksets..."
@@ -963,7 +967,7 @@
               function="Floater.ToggleOrBringToFront"
               parameter="pathfinding_linksets" />
           <menu_item_call.on_enable
-              function="Tools.EnableLinksets" />
+              function="Tools.EnablePathfindingLinksets" />
         </menu_item_call>
         <menu_item_call
             label="Characters..."
@@ -971,6 +975,8 @@
           <menu_item_call.on_click
               function="Floater.ToggleOrBringToFront"
               parameter="pathfinding_characters" />
+          <menu_item_call.on_enable
+              function="Tools.EnablePathfinding" />
         </menu_item_call>
       </menu>
 
-- 
cgit v1.2.3


From 4e9d9ebe8a480ffdd9e069388c1e9845477f5f66 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 4 Apr 2012 17:19:57 -0700
Subject: PATH-445,PATH-452: Adding functionality to reload the navmesh on
 region boundary crossing.  Also, correcting how the region boundary crossing
 is detected to make it more accurate.

---
 indra/newview/skins/default/xui/en/floater_pathfinding_console.xml | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index adcd7f0fbf..d6435ab95d 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -31,7 +31,6 @@
   <floater.string name="pathing_choose_start_point">Please choose start point.</floater.string>
   <floater.string name="pathing_choose_end_point">Please choose end point.</floater.string>
   <floater.string name="pathing_path_valid">Path is shown in orange.</floater.string>
-  <floater.string name="navmesh_update_needed">Region boundary hit, navmesh may not be accurate.</floater.string>
   <text
       height="13"
       word_wrap="true"
-- 
cgit v1.2.3


From 490e487ab113202b05381b713e49f2196e54ce20 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 5 Apr 2012 16:19:05 -0700
Subject: PATH-500: Updating the pathfinding console defaults following the
 integration of the xray code.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index d1bd1a02da..707b06c643 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -271,7 +271,7 @@
       layout="topleft"
       left="230"
       top="35"
-      height="344"
+      height="366"
       width="214"
       visible="true" />
   <tab_container
@@ -281,7 +281,7 @@
       name="edit_test_tab_container"
       left="227"
       top="14"
-      height="366"
+      height="388"
       width="218">
     <panel
         border="false"
-- 
cgit v1.2.3


From 8d9863f4ef039af4f6af7f41909e212b9101ce0f Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 6 Apr 2012 13:37:11 -0700
Subject: Altering the layout of the pathfinding console based on feedback.

---
 .../default/xui/en/floater_pathfinding_console.xml | 423 +++++++++++----------
 1 file changed, 217 insertions(+), 206 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 707b06c643..09fe5f4bc7 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -2,7 +2,7 @@
 <floater
     open_positioning="cascading"
     can_tear_off="false"
-    height="448"
+    height="406"
     layout="topleft"
     name="floater_pathfinding_console"
     help_topic="floater_pathfinding_console"
@@ -31,136 +31,14 @@
   <floater.string name="pathing_choose_start_point">Please choose start point.</floater.string>
   <floater.string name="pathing_choose_end_point">Please choose end point.</floater.string>
   <floater.string name="pathing_path_valid">Path is shown in orange.</floater.string>
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="15"
-      top="9"
-      width="208">
-    Show:
-  </text>
-  <check_box
-      height="19"
-      label="Navmesh"
-      layout="topleft"
-      left="14"
-      name="show_navmesh"
-      top_pad="7"
-      width="90" />
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      text_readonly_color="LabelDisabledColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="35"
-      width="188">
-    Show walkability map:
-  </text>
-  <combo_box
-      height="19"
-      layout="topleft"
-      left="34"
-      name="show_heatmap_mode"
-      top_pad="8"
-      width="156">
-    <combo_box.item
-        label="Do not show"
-        name="show_heatmap_mode_none"
-        value="0" />
-    <combo_box.item
-        label="Character type A"
-        name="show_heatmap_mode_a"
-        value="1" />
-    <combo_box.item
-        label="Character type B"
-        name="show_heatmap_mode_b"
-        value="2" />
-    <combo_box.item
-        label="Character type C"
-        name="show_heatmap_mode_c"
-        value="3" />
-    <combo_box.item
-        label="Character type D"
-        name="show_heatmap_mode_d"
-        value="4" />
-  </combo_box>
-  <check_box
-      height="19"
-      label="Walkables"
-      layout="topleft"
-      left="14"
-      name="show_walkables"
-      top_pad="10"
-      tool_tip="Functionality is not implemented currently."
-      width="90" />
-  <check_box
-      height="19"
-      label="Material volumes"
-      layout="topleft"
-      left="14"
-      name="show_material_volumes"
-      top_pad="4"
-      tool_tip="Functionality is not implemented currently."
-      width="90" />
-  <check_box
-      height="19"
-      label="Static obstacles"
-      layout="topleft"
-      left="14"
-      name="show_static_obstacles"
-      top_pad="4"
-      tool_tip="Functionality is not implemented currently."
-      width="90" />
-  <check_box
-      height="19"
-      label="Exclusion volumes"
-      layout="topleft"
-      left="14"
-      name="show_exclusion_volumes"
-      top_pad="4"
-      width="90" />
-  <check_box
-      height="19"
-      label="World"
-      layout="topleft"
-      left="14"
-      name="show_world"
-      top_pad="4"
-      width="90" />
-  <check_box
-      height="19"
-      label="X-Ray"
-      layout="topleft"
-      left="14"
-      name="x-ray"
-      top_pad="4"
-      width="90" />
-  <view_border
-      bevel_style="none"
-      follows="top|left"
-      layout="topleft"
-      left="14"
-      height="0"
-      width="200"
-      top_pad="12"
-      visible="true" />
   <panel
       border="false"
       bevel_style="none"
       follows="left|top"
       layout="topleft"
-      height="73"
+      left="14"
+      top_pad="15"
+      height="68"
       width="200">
     <text
         height="13"
@@ -171,7 +49,7 @@
         length="1"
         layout="topleft"
         left="0"
-        top_pad="5"
+        top_pad="0"
         width="200">
       Viewer status
     </text>
@@ -180,7 +58,7 @@
         word_wrap="true"
         use_ellipses="false"
         type="string"
-        text_color="LabelTextColor"
+        text_color="PathfindingGoodColor"
         length="1"
         follows="left|top"
         layout="topleft"
@@ -204,74 +82,124 @@
       bevel_style="none"
       follows="left|top"
       layout="topleft"
-      height="73"
+      height="250"
       width="200">
     <text
-        height="13"
-        word_wrap="true"
-        use_ellipses="false"
-        type="string"
-        text_color="LabelTextColor"
-        length="1"
-        layout="topleft"
-        left="0"
-        top_pad="5"
-        width="200">
-      Simulator status
+	height="13"
+	word_wrap="true"
+	use_ellipses="false"
+	type="string"
+	text_color="LabelTextColor"
+	length="1"
+	follows="left|top"
+	layout="topleft"
+	top_pad="9"
+	width="200">
+      Show:
     </text>
+    <check_box
+        height="19"
+        label="Navmesh"
+        layout="topleft"
+        name="show_navmesh"
+        top_pad="7"
+        width="90" />
     <text
-        height="40"
+        height="13"
         word_wrap="true"
         use_ellipses="false"
         type="string"
         text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
         length="1"
         follows="left|top"
         layout="topleft"
-        left="0"
-        name="pathfinding_simulator_status"
-        top_pad="8"
-        width="200">
+        left="20"
+        width="180">
+      Show walkability map:
     </text>
+    <combo_box
+        height="19"
+        layout="topleft"
+        left="20"
+        name="show_heatmap_mode"
+        top_pad="8"
+        width="156">
+      <combo_box.item
+          label="Do not show"
+          name="show_heatmap_mode_none"
+          value="0" />
+      <combo_box.item
+          label="Character type A"
+          name="show_heatmap_mode_a"
+          value="1" />
+      <combo_box.item
+          label="Character type B"
+          name="show_heatmap_mode_b"
+          value="2" />
+      <combo_box.item
+          label="Character type C"
+          name="show_heatmap_mode_c"
+          value="3" />
+      <combo_box.item
+          label="Character type D"
+          name="show_heatmap_mode_d"
+          value="4" />
+    </combo_box>
+    <check_box
+        height="19"
+        label="Walkables"
+        layout="topleft"
+        left="0"
+        name="show_walkables"
+        top_pad="10"
+        tool_tip="Functionality is not implemented currently."
+        width="90" />
+    <check_box
+        height="19"
+        label="Material volumes"
+        layout="topleft"
+        name="show_material_volumes"
+        top_pad="4"
+        tool_tip="Functionality is not implemented currently."
+        width="90" />
+    <check_box
+        height="19"
+        label="Static obstacles"
+        layout="topleft"
+        name="show_static_obstacles"
+        top_pad="4"
+        tool_tip="Functionality is not implemented currently."
+        width="90" />
+    <check_box
+        height="19"
+        label="Exclusion volumes"
+        layout="topleft"
+        name="show_exclusion_volumes"
+        top_pad="4"
+        width="90" />
+    <check_box
+        height="19"
+        label="World"
+        layout="topleft"
+        name="show_world"
+        top_pad="4"
+        width="90" />
+    <check_box
+        height="19"
+        label="X-Ray"
+        layout="topleft"
+        name="x-ray"
+        top_pad="4"
+        width="90" />
   </panel>
-  <view_border
-      bevel_style="none"
-      follows="top|left"
-      layout="topleft"
-      left="14"
-      height="0"
-      width="200"
-      top_pad="0"
-      visible="true" />
-  <text
-      height="13"
-      word_wrap="true"
-      use_ellipses="false"
-      type="string"
-      text_color="LabelTextColor"
-      length="1"
-      layout="topleft"
-      left="14"
-      top_pad="18"
-      width="250">
-    Lost characters? Bad performance?
-  </text>
-  <button
-      follows="left|top"
-      height="21"
-      label="Characters..."
-      layout="topleft"
-      name="view_characters_floater"
-      left_pad="0"
-      top_pad="-17"
-      width="96"/>
   <view_border
       bevel_style="none"
       follows="top|left"
       layout="topleft"
       left="230"
       top="35"
-      height="366"
+      height="247"
       width="214"
       visible="true" />
   <tab_container
@@ -281,7 +209,7 @@
       name="edit_test_tab_container"
       left="227"
       top="14"
-      height="388"
+      height="268"
       width="218">
     <panel
         border="false"
@@ -378,6 +306,41 @@
         left="1"
         name="test_panel"
         label="Test">
+      <text
+          height="14"
+          word_wrap="true"
+          use_ellipses="false"
+          type="string"
+          text_color="LabelTextColor"
+          length="1"
+          left="16"
+          follows="left|top"
+          layout="topleft"
+          top_pad="12"
+          width="190">
+        Ctrl-click to select start point.
+      </text>
+      <text
+          height="14"
+          word_wrap="true"
+          use_ellipses="false"
+          type="string"
+          text_color="LabelTextColor"
+          length="1"
+          follows="left|top"
+          layout="topleft"
+          top_pad="5"
+          width="190">
+        Shift-click to select end point.
+      </text>
+      <view_border
+          bevel_style="none"
+          follows="top|left"
+          layout="topleft"
+          height="0"
+          width="185"
+          top_pad="13"
+          visible="true" />
       <text
           height="14"
           word_wrap="true"
@@ -387,7 +350,6 @@
           length="1"
           follows="left|top"
           layout="topleft"
-          left="16"
           top_pad="14"
           width="190">
         Character width
@@ -465,33 +427,7 @@
           word_wrap="true"
           use_ellipses="false"
           type="string"
-          text_color="LabelTextColor"
-          length="1"
-          follows="left|top"
-          layout="topleft"
-          top_pad="12"
-          width="190">
-        Ctrl-click to select start point.
-      </text>
-      <text
-          height="14"
-          word_wrap="true"
-          use_ellipses="false"
-          type="string"
-          text_color="LabelTextColor"
-          length="1"
-          follows="left|top"
-          layout="topleft"
-          top_pad="5"
-          width="190">
-        Shift-click to select end point.
-      </text>
-      <text
-          height="14"
-          word_wrap="true"
-          use_ellipses="false"
-          type="string"
-          text_color="LabelTextColor"
+          text_color="PathfindingGoodColor"
           length="1"
           follows="left|top"
           layout="topleft"
@@ -509,4 +445,79 @@
           width="96"/>
     </panel>
   </tab_container>
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|top"
+      layout="topleft"
+      left="246"
+      height="73"
+      width="200">
+    <text
+        height="13"
+        word_wrap="true"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        layout="topleft"
+        left="0"
+        top_pad="5"
+        width="200">
+      Simulator status
+    </text>
+    <text
+        height="40"
+        word_wrap="true"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left="0"
+        name="pathfinding_simulator_status"
+        top_pad="8"
+        width="200">
+    </text>
+  </panel>
+  <view_border
+      bevel_style="none"
+      follows="top|left"
+      layout="topleft"
+      height="0"
+      left="14"
+      width="430"
+      top_pad="0"
+      visible="true" />
+  <panel
+      border="false"
+      bevel_style="none"
+      follows="left|top"
+      layout="topleft"
+      height="40"
+      top_pad="0"
+      width="400">
+    <text
+	height="13"
+	word_wrap="true"
+	use_ellipses="false"
+	type="string"
+	text_color="LabelTextColor"
+	length="1"
+	layout="topleft"
+	top_pad="18"
+	width="250">
+      Lost characters? Bad performance?
+    </text>
+    <button
+        follows="left|top"
+        height="21"
+        label="Characters..."
+        layout="topleft"
+        name="view_characters_floater"
+        left_pad="0"
+        top_pad="-17"
+        width="96"/>
+  </panel>
 </floater>
-- 
cgit v1.2.3


From 4888f7d34969b596e2b37ef72576118e1c0c27ac Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 6 Apr 2012 18:00:52 -0700
Subject: PATH-265: Adding an error message to the testing tab of the
 pathfinding floater console to indicate when a path cannot be found.

---
 indra/newview/skins/default/xui/en/floater_pathfinding_console.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 09fe5f4bc7..e43fda01e0 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -31,6 +31,7 @@
   <floater.string name="pathing_choose_start_point">Please choose start point.</floater.string>
   <floater.string name="pathing_choose_end_point">Please choose end point.</floater.string>
   <floater.string name="pathing_path_valid">Path is shown in orange.</floater.string>
+  <floater.string name="pathing_path_invalid">A path between the chosen points cannot be found.</floater.string>
   <panel
       border="false"
       bevel_style="none"
-- 
cgit v1.2.3


From 2115211328261d875dc0ccacdc2021f1c501a36d Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 9 Apr 2012 18:53:52 -0700
Subject: Re-implementing the path testing functionality as a proper LLTool.

---
 indra/newview/skins/default/xui/en/floater_pathfinding_console.xml | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index e43fda01e0..28f0d9fa4a 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -27,11 +27,15 @@
   <floater.string name="navmesh_simulator_status_some_building">Some navmesh regions are building.</floater.string>
   <floater.string name="navmesh_simulator_status_pending_and_building">Some navmesh regions have pending changes and others are building.</floater.string>
   <floater.string name="navmesh_simulator_status_complete">Navmesh is up-to-date.</floater.string>
+  <floater.string name="pathing_unknown"></floater.string>
+  <floater.string name="pathing_library_not_implemented">Cannot find pathing library implementation.</floater.string>
+  <floater.string name="pathing_region_not_enabled">This region is not enabled for pathfinding.</floater.string>
   <floater.string name="pathing_choose_start_and_end_points">Please choose start and end points.</floater.string>
   <floater.string name="pathing_choose_start_point">Please choose start point.</floater.string>
   <floater.string name="pathing_choose_end_point">Please choose end point.</floater.string>
   <floater.string name="pathing_path_valid">Path is shown in orange.</floater.string>
   <floater.string name="pathing_path_invalid">A path between the chosen points cannot be found.</floater.string>
+  <floater.string name="pathing_error">An error occurred during path generation.</floater.string>
   <panel
       border="false"
       bevel_style="none"
-- 
cgit v1.2.3


From e73f5ef5620d9774187575610aeaf16b917b7337 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 19 Apr 2012 18:09:53 -0700
Subject: Ensuring that the view characters button is active in builds with
 stubbed pathing libraries.  Also, adding extra label fields to better
 indicate enabled/disabled controls on the console.

---
 .../default/xui/en/floater_pathfinding_console.xml | 51 ++++++++++++++--------
 1 file changed, 32 insertions(+), 19 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 28f0d9fa4a..7c1c7b687e 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -90,16 +90,18 @@
       height="250"
       width="200">
     <text
-	height="13"
-	word_wrap="true"
-	use_ellipses="false"
-	type="string"
-	text_color="LabelTextColor"
-	length="1"
-	follows="left|top"
-	layout="topleft"
-	top_pad="9"
-	width="200">
+        height="13"
+        word_wrap="true"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        name="show_label"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        top_pad="9"
+        width="200">
       Show:
     </text>
     <check_box
@@ -116,6 +118,7 @@
         type="string"
         text_color="LabelTextColor"
         text_readonly_color="LabelDisabledColor"
+        name="show_walkability_label"
         length="1"
         follows="left|top"
         layout="topleft"
@@ -317,6 +320,8 @@
           use_ellipses="false"
           type="string"
           text_color="LabelTextColor"
+          text_readonly_color="LabelDisabledColor"
+          name="ctrl_click_label"
           length="1"
           left="16"
           follows="left|top"
@@ -331,6 +336,8 @@
           use_ellipses="false"
           type="string"
           text_color="LabelTextColor"
+          text_readonly_color="LabelDisabledColor"
+          name="shift_click_label"
           length="1"
           follows="left|top"
           layout="topleft"
@@ -352,6 +359,8 @@
           use_ellipses="false"
           type="string"
           text_color="LabelTextColor"
+          text_readonly_color="LabelDisabledColor"
+          name="character_width_label"
           length="1"
           follows="left|top"
           layout="topleft"
@@ -377,6 +386,8 @@
           use_ellipses="false"
           type="string"
           text_color="LabelTextColor"
+          text_readonly_color="LabelDisabledColor"
+          name="character_width_unit_label"
           length="1"
           follows="left|top"
           layout="topleft"
@@ -391,6 +402,8 @@
           use_ellipses="false"
           type="string"
           text_color="LabelTextColor"
+          text_readonly_color="LabelDisabledColor"
+          name="character_type_label"
           length="1"
           follows="left|top"
           layout="topleft"
@@ -504,15 +517,15 @@
       top_pad="0"
       width="400">
     <text
-	height="13"
-	word_wrap="true"
-	use_ellipses="false"
-	type="string"
-	text_color="LabelTextColor"
-	length="1"
-	layout="topleft"
-	top_pad="18"
-	width="250">
+        height="13"
+        word_wrap="true"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        length="1"
+        layout="topleft"
+        top_pad="18"
+        width="250">
       Lost characters? Bad performance?
     </text>
     <button
-- 
cgit v1.2.3


From de71961b0d400d4989181ee7419942955a775741 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 20 Apr 2012 18:15:55 -0700
Subject: Adding new controls to the console for showing waterplane and world
 movables only.  Also, re-arranging the sorting of the check boxes.

---
 .../default/xui/en/floater_pathfinding_console.xml | 33 +++++++++++++++-------
 1 file changed, 23 insertions(+), 10 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 7c1c7b687e..a951106640 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -2,7 +2,7 @@
 <floater
     open_positioning="cascading"
     can_tear_off="false"
-    height="406"
+    height="446"
     layout="topleft"
     name="floater_pathfinding_console"
     help_topic="floater_pathfinding_console"
@@ -87,7 +87,7 @@
       bevel_style="none"
       follows="left|top"
       layout="topleft"
-      height="250"
+      height="297"
       width="200">
     <text
         height="13"
@@ -104,9 +104,25 @@
         width="200">
       Show:
     </text>
+    <check_box
+        height="19"
+        label="World"
+        layout="topleft"
+        name="show_world"
+        top_pad="4"
+        width="90" />
+    <check_box
+        height="19"
+        label="Movables only"
+        layout="topleft"
+        left="20"
+        name="show_world_movables_only"
+        top_pad="4"
+        width="90" />
     <check_box
         height="19"
         label="Navmesh"
+        left="0"
         layout="topleft"
         name="show_navmesh"
         top_pad="7"
@@ -161,7 +177,6 @@
         left="0"
         name="show_walkables"
         top_pad="10"
-        tool_tip="Functionality is not implemented currently."
         width="90" />
     <check_box
         height="19"
@@ -169,7 +184,6 @@
         layout="topleft"
         name="show_material_volumes"
         top_pad="4"
-        tool_tip="Functionality is not implemented currently."
         width="90" />
     <check_box
         height="19"
@@ -177,7 +191,6 @@
         layout="topleft"
         name="show_static_obstacles"
         top_pad="4"
-        tool_tip="Functionality is not implemented currently."
         width="90" />
     <check_box
         height="19"
@@ -188,16 +201,16 @@
         width="90" />
     <check_box
         height="19"
-        label="World"
+        label="Water plane"
         layout="topleft"
-        name="show_world"
+        name="show_water_plane"
         top_pad="4"
         width="90" />
     <check_box
         height="19"
-        label="X-Ray"
+        label="With X-ray vision"
         layout="topleft"
-        name="x-ray"
+        name="show_xray"
         top_pad="4"
         width="90" />
   </panel>
@@ -506,7 +519,7 @@
       height="0"
       left="14"
       width="430"
-      top_pad="0"
+      top_pad="25"
       visible="true" />
   <panel
       border="false"
-- 
cgit v1.2.3


From a72034fa42ebaf7e2f56c4a8cb0f445f12d22fe4 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 24 Apr 2012 19:23:20 -0700
Subject: PATH-580: BUGFIX Adding functionality to detect when the region's
 capabilities have not yet been loading and deferring requests for the navmesh
 query until the capabilities are fully loaded.

---
 indra/newview/skins/default/xui/en/floater_pathfinding_console.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index a951106640..54d44be015 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -14,6 +14,7 @@
   <floater.string name="navmesh_viewer_status_unknown"></floater.string>
   <floater.string name="navmesh_viewer_status_library_not_implemented">Cannot find pathing library implementation.</floater.string>
   <floater.string name="navmesh_viewer_status_region_not_enabled">This region is not enabled for pathfinding.</floater.string>
+  <floater.string name="navmesh_viewer_status_region_loading">Waiting for the region to finish loading.</floater.string>
   <floater.string name="navmesh_viewer_status_checking_version">Checking the status of the navmesh.</floater.string>
   <floater.string name="navmesh_viewer_status_downloading">Downloading the navmesh.</floater.string>
   <floater.string name="navmesh_viewer_status_updating">The navmesh has changed on the server. Downloading the latest navmesh.</floater.string>
-- 
cgit v1.2.3


From 932921766740655de84108970095ca17d24c5829 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 27 Apr 2012 17:08:33 -0700
Subject: PATH-585: Adding an initial notification for when a server-side
 automatic unfreeze occurs.

---
 .../newview/skins/default/xui/en/notifications.xml | 34 ++++++++++++++++++++++
 indra/newview/skins/default/xui/en/strings.xml     |  3 ++
 2 files changed, 37 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3b03bc0aed..a0a670f233 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -77,6 +77,21 @@
     </form>
   </template>
 
+  <template name="okhelpignore">
+    <form>
+      <button
+       default="true"
+       index="0"
+       name="OK_okhelpignore"
+       text="$yestext"/>
+      <button
+       index="1"
+       name="Help_okhelpignore"
+       text="$helptext"/>
+      <ignore text="$ignoretext"/>
+    </form>
+  </template>
+
   <template name="yesnocancelbuttons">
     <form>
       <button
@@ -1284,6 +1299,25 @@ The region [REGION] does not allow terraforming.
     <tag>fail</tag>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="AutomaticAgentStateUnfreeze"
+   type="alertmodal">
+You have automatically switched into Unfrozen mode because of one of the following reasons:
+
+- You rezzed an object marked as permanent
+- You returned an object marked as permanent
+
+After you finish modifying your permanent objects, please remember to switch back to Frozen mode  from the menu option Build->Pathfinding->Basic Setup.
+    <tag>confirm</tag>
+    <usetemplate
+      name="okhelpignore"
+      yestext="OK"
+      helptext="More Info"
+      ignoretext="Launch browser to view pathfinding help"
+      />
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="CannotCopyWarning"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 61935c77c3..5fb629b704 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3888,6 +3888,9 @@ Try enclosing path to the editor with double quotes.
   <string name="Preview">Preview</string>
   <string name="Normal">Normal</string>
 
+  <!-- Pathfinding -->
+  <string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
+  
   <!-- Snapshot image quality levels -->
   <string name="snapshot_quality_very_low">Very Low</string>
   <string name="snapshot_quality_low">Low</string>
-- 
cgit v1.2.3


From 7a9f62ab302d365238871f3bdcc251c04ad14270 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 7 May 2012 16:53:06 -0700
Subject: Increasing the size of the name and description input fields.

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

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

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 1349bff441..98456e75d7 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -79,7 +79,7 @@
         layout="topleft"
         left_pad="0"
         top_pad="-18"
-        max_length_bytes="10"
+        max_length_chars="255"
         name="filter_by_name"
         width="105" />
     <text
@@ -104,7 +104,7 @@
         layout="topleft"
         left_pad="0"
         top_pad="-17"
-        max_length_bytes="10"
+        max_length_chars="255"
         name="filter_by_description"
         width="145" />
     <combo_box
-- 
cgit v1.2.3


From d4e5e180f82a8d959b88cc3eb1f69a3fff238d6a Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 9 May 2012 18:04:45 -0700
Subject: Adding an owner field to the pathfinding linksets console.  Making
 the scroll list just wide enough for the additional field, but not cleaning
 up the rest of the floater until Leo has a chance to review.

---
 .../skins/default/xui/en/floater_pathfinding_linksets.xml    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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

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 98456e75d7..4c88c5bd39 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -4,9 +4,9 @@
     can_resize="true"
     can_tear_off="false"
     height="382"
-    width="950"
+    width="1091"
     min_height="382"
-    min_width="950"
+    min_width="1091"
     layout="topleft"
     name="floater_pathfinding_linksets"
     help_topic="floater_pathfinding_linksets"
@@ -24,8 +24,10 @@
   <floater.string name="linksets_messaging_not_enabled">This region is not enabled for pathfinding.</floater.string>
   <floater.string name="linkset_terrain_name">[Terrain]</floater.string>
   <floater.string name="linkset_terrain_description">--</floater.string>
+  <floater.string name="linkset_terrain_owner">--</floater.string>
   <floater.string name="linkset_terrain_land_impact">--</floater.string>
   <floater.string name="linkset_terrain_dist_from_you">--</floater.string>
+  <floater.string name="linkset_owner_unknown">Unknown</floater.string>
   <floater.string name="linkset_use_walkable">Walkable</floater.string>
   <floater.string name="linkset_use_static_obstacle">Static obstacle</floater.string>
   <floater.string name="linkset_use_dynamic_obstacle">Movable obstacle</floater.string>
@@ -173,7 +175,7 @@
         tab_stop="false"
         multi_select="true"
         name="pathfinding_linksets"
-        width="910">
+        width="1051">
       <scroll_list.columns
           label="Name (root prim)"
           name="name"
@@ -182,6 +184,10 @@
           label="Description (root prim)"
           name="description"
           width="166" />
+      <scroll_list.columns
+          label="Owner"
+          name="owner"
+          width="141" />
       <scroll_list.columns
           label="Land impact"
           name="land_impact"
-- 
cgit v1.2.3


From e58001b4d2a44920f5be1faf4a354aa125a1e62e Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 11 May 2012 13:02:47 -0700
Subject: For the pathifnding linksets floater, correcting layout issues and
 fixing a bug where the scroll bar was not working correctly.

---
 .../xui/en/floater_pathfinding_linksets.xml        | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

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

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 4c88c5bd39..b4e367690c 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -4,9 +4,9 @@
     can_resize="true"
     can_tear_off="false"
     height="382"
-    width="1091"
+    width="1015"
     min_height="382"
-    min_width="1091"
+    min_width="1015"
     layout="topleft"
     name="floater_pathfinding_linksets"
     help_topic="floater_pathfinding_linksets"
@@ -45,7 +45,7 @@
       follows="left|top|right|bottom"
       layout="topleft"
       height="226"
-      width="950">
+      width="999">
     <text
         height="13"
         word_wrap="false"
@@ -83,7 +83,7 @@
         top_pad="-18"
         max_length_chars="255"
         name="filter_by_name"
-        width="105" />
+        width="161" />
     <text
         height="13"
         word_wrap="false"
@@ -108,7 +108,7 @@
         top_pad="-17"
         max_length_chars="255"
         name="filter_by_description"
-        width="145" />
+        width="162" />
     <combo_box
         height="20"
         layout="topleft"
@@ -175,7 +175,7 @@
         tab_stop="false"
         multi_select="true"
         name="pathfinding_linksets"
-        width="1051">
+        width="980">
       <scroll_list.columns
           label="Name (root prim)"
           name="name"
@@ -183,19 +183,19 @@
       <scroll_list.columns
           label="Description (root prim)"
           name="description"
-          width="166" />
+          dynamic_width="true" />
       <scroll_list.columns
           label="Owner"
           name="owner"
           width="141" />
       <scroll_list.columns
-          label="Land impact"
+          label="Impact"
           name="land_impact"
-          width="88" />
+          width="55" />
       <scroll_list.columns
-          label="Dist from you"
+          label="Distance"
           name="dist_from_you"
-          width="97" />
+          width="65" />
       <scroll_list.columns
           label="Linkset use"
           name="linkset_use"
@@ -228,7 +228,7 @@
         layout="topleft"
         name="linksets_status"
         top_pad="17"
-        width="549">
+        width="619">
       Linksets:
     </text>
     <button
@@ -267,7 +267,7 @@
       name="horiz_separator"
       top_pad="0"
       left="18"
-      width="912"/>
+      width="979"/>
   <panel
       border="false"
       bevel_style="none"
@@ -354,7 +354,7 @@
       name="horiz_separator"
       top_pad="0"
       left="18"
-      width="912"/>
+      width="979"/>
   <panel
       border="false"
       bevel_style="none"
-- 
cgit v1.2.3


From cab86a913d4e94cc923518638e177d6284af2542 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 18 May 2012 19:14:43 -0700
Subject: PATH-638: Adding elements to render the new sim stats.

---
 .../newview/skins/default/xui/en/floater_stats.xml | 1659 ++++++++++----------
 1 file changed, 860 insertions(+), 799 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index 2fd932786b..003a92e37a 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -1,827 +1,888 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- legacy_header_height="18"
- can_resize="true"
- height="400"
- layout="topleft"
- name="Statistics"
- help_topic="statistics"
- save_rect="true"
- save_visibility="true"
- title="STATISTICS"
- width="260">
-    <scroll_container
-     follows="top|left|bottom|right"
-     height="380"
-     layout="topleft"
-     left="0"
-     name="statistics_scroll"
-     reserve_scroll_corner="true"
-     top="20"
-     width="260">
-      <container_view
-       follows="top|left|bottom|right"
-       height="378"
-       layout="topleft"
-       left="2"
-       name="statistics_view"
-       top="20"
-       width="245" >
-        <!--Basic Section-->
-		  <stat_view
-			 name="basic"
-			 label="Basic"
-			 show_label="true"
-			 setting="OpenDebugStatBasic">
-			<stat_bar
-			   name="fps"
-			   label="FPS"
-			   unit_label="fps"
-			   stat="fpsstat"
-			   bar_min="0"
-			   bar_max="60"
-			   tick_spacing="6"
-			   label_spacing="12"
-			   precision="1"
-			   show_bar="true"
-			   show_history="true">
-			</stat_bar>
-			<stat_bar
-			   name="bandwidth"
-			   label="Bandwidth"
-			   unit_label="kbps"
-			   stat="kbitstat"
-			   bar_min="0"
-			   bar_max="5000"
-			   tick_spacing="500"
-			   label_spacing="1000"
-				 precision="0"
-			   show_bar="true"
-			   show_history="false">
-			</stat_bar>
-			<stat_bar
-			   name="packet_loss"
-			   label="Packet Loss"
-			   unit_label=" %"
-			   stat="packetslostpercentstat"
-			   bar_min="0"
-			   bar_max="5"
-			   tick_spacing="0.5"
-			   label_spacing="1"
-			   precision="3"
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="true">
-			</stat_bar>
-			<stat_bar
-			   name="ping"
-			   label="Ping Sim"
-			   unit_label="msec"
-			   stat="simpingstat"
-			   bar_min="0"
-			   bar_max="5000"
-			   tick_spacing="500"
-			   label_spacing="1000"
-				 precision="0"
-			   show_bar="false"
-			   show_per_sec="false"
-			   show_mean="false">
-			</stat_bar>
-		  </stat_view>
-          <!--Advanced Section-->
+    legacy_header_height="18"
+    can_resize="true"
+    height="400"
+    layout="topleft"
+    name="Statistics"
+    help_topic="statistics"
+    save_rect="true"
+    save_visibility="true"
+    title="STATISTICS"
+    width="260">
+  <scroll_container
+      follows="top|left|bottom|right"
+      height="380"
+      layout="topleft"
+      left="0"
+      name="statistics_scroll"
+      reserve_scroll_corner="true"
+      top="20"
+      width="260">
+    <container_view
+        follows="top|left|bottom|right"
+        height="378"
+        layout="topleft"
+        left="2"
+        name="statistics_view"
+        top="20"
+        width="245" >
+      <!--Basic Section-->
       <stat_view
-			 name="advanced"
-			 label="Advanced"
-			 show_label="true"
-			 setting="OpenDebugStatAdvanced">
-			<stat_view
-			   name="render"
-			   label="Render"
-			   show_label="true"
-			   setting="OpenDebugStatRender">
-			  <stat_bar
-				 name="ktrisframe"
-				 label="KTris Drawn per Frame"
-				 unit_label="/fr"
-				 stat="trianglesdrawnstat"
-				 bar_min="0"
-				 bar_max="10000"
-				 tick_spacing="1000"
-				 label_spacing="2000"
-				 precision="0"
-				 show_per_sec="false"
-         show_bar="false">
+          name="basic"
+          label="Basic"
+          show_label="true"
+          setting="OpenDebugStatBasic">
+        <stat_bar
+            name="fps"
+            label="FPS"
+            unit_label="fps"
+            stat="fpsstat"
+            bar_min="0"
+            bar_max="60"
+            tick_spacing="6"
+            label_spacing="12"
+            precision="1"
+            show_bar="true"
+            show_history="true">
+        </stat_bar>
+        <stat_bar
+            name="bandwidth"
+            label="Bandwidth"
+            unit_label="kbps"
+            stat="kbitstat"
+            bar_min="0"
+            bar_max="5000"
+            tick_spacing="500"
+            label_spacing="1000"
+            precision="0"
+            show_bar="true"
+            show_history="false">
         </stat_bar>
-			  <stat_bar
-				 name="ktrissec"
-				 label="KTris Drawn per Sec"
-				 unit_label="/sec"
-				 stat="trianglesdrawnstat"
-				 bar_min="0"
-				 bar_max="200000"
-				 tick_spacing="25000"
-				 label_spacing="50000"
-				 precision="0"
-         show_bar="false">
+        <stat_bar
+            name="packet_loss"
+            label="Packet Loss"
+            unit_label=" %"
+            stat="packetslostpercentstat"
+            bar_min="0"
+            bar_max="5"
+            tick_spacing="0.5"
+            label_spacing="1"
+            precision="3"
+            show_per_sec="false"
+            show_bar="false"
+            show_mean="true">
         </stat_bar>
-			  <stat_bar
-				 name="objs"
-				 label="Total Objects"
-				 unit_label=""
-				 stat="numobjectsstat"
-				 bar_min="0"
-				 bar_max="50000"
-				 tick_spacing="5000"
-				 label_spacing="10000"
-				 precision="0"
-				 show_per_sec="false"
-				 show_bar="false">
-			  </stat_bar>
-			  <stat_bar
-				 name="newobjs"
-				 label="New Objects"
-				 unit_label="/sec"
-				 stat="numnewobjectsstat"
-				 bar_min="0"
-				 bar_max="2000"
-				 tick_spacing="200"
-				 label_spacing="400"
-				 show_per_sec="true"
-				 show_bar="false">
-			  </stat_bar>
-			</stat_view>
+        <stat_bar
+            name="ping"
+            label="Ping Sim"
+            unit_label="msec"
+            stat="simpingstat"
+            bar_min="0"
+            bar_max="5000"
+            tick_spacing="500"
+            label_spacing="1000"
+            precision="0"
+            show_bar="false"
+            show_per_sec="false"
+            show_mean="false">
+        </stat_bar>
+      </stat_view>
+      <!--Advanced Section-->
+      <stat_view
+          name="advanced"
+          label="Advanced"
+          show_label="true"
+          setting="OpenDebugStatAdvanced">
+        <stat_view
+            name="render"
+            label="Render"
+            show_label="true"
+            setting="OpenDebugStatRender">
+          <stat_bar
+              name="ktrisframe"
+              label="KTris Drawn per Frame"
+              unit_label="/fr"
+              stat="trianglesdrawnstat"
+              bar_min="0"
+              bar_max="10000"
+              tick_spacing="1000"
+              label_spacing="2000"
+              precision="0"
+              show_per_sec="false"
+              show_bar="false">
+          </stat_bar>
+          <stat_bar
+              name="ktrissec"
+              label="KTris Drawn per Sec"
+              unit_label="/sec"
+              stat="trianglesdrawnstat"
+              bar_min="0"
+              bar_max="200000"
+              tick_spacing="25000"
+              label_spacing="50000"
+              precision="0"
+              show_bar="false">
+          </stat_bar>
+          <stat_bar
+              name="objs"
+              label="Total Objects"
+              unit_label=""
+              stat="numobjectsstat"
+              bar_min="0"
+              bar_max="50000"
+              tick_spacing="5000"
+              label_spacing="10000"
+              precision="0"
+              show_per_sec="false"
+              show_bar="false">
+          </stat_bar>
+          <stat_bar
+              name="newobjs"
+              label="New Objects"
+              unit_label="/sec"
+              stat="numnewobjectsstat"
+              bar_min="0"
+              bar_max="2000"
+              tick_spacing="200"
+              label_spacing="400"
+              show_per_sec="true"
+              show_bar="false">
+          </stat_bar>
+        </stat_view>
         <!--Texture Stats-->
-			<stat_view
-			   name="texture"
-			   label="Texture"
-			   show_label="true">
-			  <stat_bar
-				 name="numimagesstat"
-				 label="Count"
-				 stat="numimagesstat" 
-				 bar_min="0.f"
-				 bar_max="8000.f" 
-				 tick_spacing="2000.f"
-				 label_spacing="4000.f" 
-				 show_per_sec="false"
-				 show_bar="false">
-			  </stat_bar>
-
-			  <stat_bar
-				 name="numrawimagesstat"
-				 label="Raw Count"
-				 stat="numrawimagesstat"
-				 bar_min="0.f"
-				 bar_max="8000.f" 
-				 tick_spacing="2000.f"
-				 label_spacing="4000.f" 
-				 show_per_sec="false"
-				 show_bar="false">
-			  </stat_bar>
-
-			  <stat_bar
-				 name="gltexmemstat"
-				 label="GL Mem"
-				 stat="gltexmemstat"
-				 bar_min="0.f"
-				 bar_max="400.f" 
-				 tick_spacing="100.f"
-				 label_spacing="200.f" 
-				 precision="1"
-				 show_per_sec="false" 
-         show_bar="false">
+        <stat_view
+            name="texture"
+            label="Texture"
+            show_label="true">
+          <stat_bar
+              name="numimagesstat"
+              label="Count"
+              stat="numimagesstat" 
+              bar_min="0.f"
+              bar_max="8000.f" 
+              tick_spacing="2000.f"
+              label_spacing="4000.f" 
+              show_per_sec="false"
+              show_bar="false">
+          </stat_bar>
+
+          <stat_bar
+              name="numrawimagesstat"
+              label="Raw Count"
+              stat="numrawimagesstat"
+              bar_min="0.f"
+              bar_max="8000.f" 
+              tick_spacing="2000.f"
+              label_spacing="4000.f" 
+              show_per_sec="false"
+              show_bar="false">
+          </stat_bar>
+
+          <stat_bar
+              name="gltexmemstat"
+              label="GL Mem"
+              stat="gltexmemstat"
+              bar_min="0.f"
+              bar_max="400.f" 
+              tick_spacing="100.f"
+              label_spacing="200.f" 
+              precision="1"
+              show_per_sec="false" 
+              show_bar="false">
+          </stat_bar>
+
+          <stat_bar
+              name="formattedmemstat"
+              label="Formatted Mem"
+              stat="formattedmemstat"
+              bar_min="0.f"
+              bar_max="400.f" 
+              tick_spacing="100.f"
+              label_spacing="200.f" 
+              precision="1"
+              show_per_sec="false" 
+              show_bar="false">
+          </stat_bar>
+
+          <stat_bar
+              name="rawmemstat"
+              label="Raw Mem"
+              stat="rawmemstat"
+              bar_min="0.f"
+              bar_max="400.f" 
+              tick_spacing="100.f"
+              label_spacing="200.f" 
+              precision="1"
+              show_per_sec="false" 
+              show_bar="false">
+          </stat_bar>
+
+          <stat_bar
+              name="glboundmemstat"
+              label="Bound Mem"
+              stat="glboundmemstat"
+              bar_min="0.f"
+              bar_max="400.f" 
+              tick_spacing="100.f"
+              label_spacing="200.f" 
+              precision="1"
+              show_per_sec="false" 
+              show_bar="false">
+          </stat_bar>
+        </stat_view>
+        <!--Network Stats-->
+        <stat_view
+            name="network"
+            label="Network"
+            show_label="true"
+            setting="OpenDebugStatNet">
+          <stat_bar
+              name="packetsinstat"
+              label="Packets In"
+              stat="packetsinstat"
+              unit_label="/sec" 
+              bar_min="0.f"
+              bar_max="1024.f" 
+              tick_spacing="128.f"
+              label_spacing="256.f" 
+              precision="1"
+              show_bar="false">
+          </stat_bar>
+
+          <stat_bar
+              name="packetsoutstat"
+              label="Packets Out"
+              stat="packetsoutstat"
+              unit_label="/sec"  
+              bar_min="0.f"
+              bar_max="1024.f" 
+              tick_spacing="128.f"
+              label_spacing="256.f" 
+              precision="1"
+              show_bar="false" >
+          </stat_bar>
+
+          <stat_bar
+              name="objectkbitstat"
+              label="Objects"
+              stat="objectkbitstat"
+              unit_label="kbps"
+              bar_min="0.f"
+              bar_max="1024.f"
+              tick_spacing="128.f"
+              label_spacing="256.f"
+              precision="1"
+              show_bar="false" >
+          </stat_bar>
+
+          <stat_bar
+              name="texturekbitstat"
+              label="Texture"
+              stat="texturekbitstat"
+              unit_label="kbps"
+              bar_min="0.f"
+              bar_max="1024.f"
+              tick_spacing="128.f"
+              label_spacing="256.f"
+              precision="1"
+              show_bar="false" >
+          </stat_bar>
+
+          <stat_bar
+              name="assetkbitstat"
+              label="Asset"
+              stat="assetkbitstat"
+              unit_label="kbps"
+              bar_min="0.f"
+              bar_max="1024.f"
+              tick_spacing="128.f"
+              label_spacing="256.f"
+              precision="1"
+              show_bar="false" >
+          </stat_bar>
+
+          <stat_bar
+              name="layerskbitstat"
+              label="Layers"
+              stat="layerskbitstat"
+              unit_label="kbps"
+              bar_min="0.f"
+              bar_max="1024.f"
+              tick_spacing="128.f"
+              label_spacing="256.f"
+              precision="1"
+              show_bar="false" >
+          </stat_bar>
+
+          <stat_bar
+              name="actualinkbitstat"
+              label="Actual In"
+              stat="actualinkbitstat"
+              unit_label="kbps"
+              bar_min="0.f"
+              bar_max="1024.f"
+              tick_spacing="128.f"
+              label_spacing="256.f"
+              precision="1"
+              show_bar="false"
+              show_history="false" >
+          </stat_bar>
+
+          <stat_bar
+              name="actualoutkbitstat"
+              label="Actual Out"
+              stat="actualoutkbitstat"
+              unit_label="kbps"
+              bar_min="0.f"
+              bar_max="1024.f"
+              tick_spacing="128.f"
+              label_spacing="256.f"
+              precision="1"
+              show_bar="false"
+              show_history="false">
+          </stat_bar>
+
+          <stat_bar
+              name="vfspendingoperations"
+              label="VFS Pending Operations"
+              stat="vfspendingoperations"
+              unit_label=" Ops."
+              show_per_sec="false"
+              show_bar="false" >
+          </stat_bar>
+        </stat_view>
+      </stat_view>
+      <!--Sim Stats-->
+      <stat_view
+          name="sim"
+          label="Simulator"
+          show_label="true"
+          setting="OpenDebugStatSim">
+        <stat_bar
+            name="simtimedilation"
+            label="Time Dilation"
+            stat="simtimedilation"
+            precision="3"
+            bar_min="0.f"
+            bar_max="1.f" 
+            tick_spacing="0.16666f"
+            label_spacing="0.33333f" 
+            show_per_sec="false"
+            show_bar="false"
+            show_mean="false" >
         </stat_bar>
 
-			  <stat_bar
-				 name="formattedmemstat"
-				 label="Formatted Mem"
-				 stat="formattedmemstat"
-				 bar_min="0.f"
-				 bar_max="400.f" 
-				 tick_spacing="100.f"
-				 label_spacing="200.f" 
-				 precision="1"
-				 show_per_sec="false" 
-         show_bar="false">
+        <stat_bar
+            name="simfps"
+            label="Sim FPS"
+            stat="simfps"
+            precision="1"
+            bar_min="0.f"
+            bar_max="45.f" 
+            tick_spacing="7.5f"
+            label_spacing="15.f" 
+            show_per_sec="false"
+            show_bar="false"
+            show_mean="false" >
         </stat_bar>
 
-			  <stat_bar
-				 name="rawmemstat"
-				 label="Raw Mem"
-				 stat="rawmemstat"
-				 bar_min="0.f"
-				 bar_max="400.f" 
-				 tick_spacing="100.f"
-				 label_spacing="200.f" 
-				 precision="1"
-				 show_per_sec="false" 
-         show_bar="false">
+        <stat_bar
+            name="simphysicsfps"
+            label="Physics FPS"
+            stat="simphysicsfps"
+            precision="1"
+            bar_min="0.f"
+            bar_max="45.f" 
+            tick_spacing="7.5.f"
+            label_spacing="15.f" 
+            show_per_sec="false"
+            show_bar="false"
+            show_mean="false" >
         </stat_bar>
 
-			  <stat_bar
-				 name="glboundmemstat"
-				 label="Bound Mem"
-				 stat="glboundmemstat"
-				 bar_min="0.f"
-				 bar_max="400.f" 
-				 tick_spacing="100.f"
-				 label_spacing="200.f" 
-				 precision="1"
-				 show_per_sec="false" 
-         show_bar="false">
+        <stat_view
+            name="physicsdetail"
+            label="Physics Details"
+            show_label="true">
+          <stat_bar
+              name="physicspinnedtasks"
+              label="Pinned Objects"
+              stat="physicspinnedtasks"
+              precision="0" 
+              bar_min="0.f"
+              bar_max="500.f" 
+              tick_spacing="50.f"
+              label_spacing="100.f" 
+              show_per_sec="false"
+              show_bar="false"
+              show_mean="false" >
+          </stat_bar>
+
+          <stat_bar
+              name="physicslodtasks"
+              label="Low LOD Objects"
+              stat="physicslodtasks"
+              precision="0"
+              bar_min="0.f"
+              bar_max="500.f" 
+              tick_spacing="50.f"
+              label_spacing="100.f" 
+              show_per_sec="false"
+              show_bar="false"
+              show_mean="false" >
+          </stat_bar>
+
+          <stat_bar
+              name="physicsmemoryallocated"
+              label="Memory Allocated"
+              stat="physicsmemoryallocated"
+              unit_label="MB"
+              precision="1"
+              bar_min="0.f"
+              bar_max="1024.f" 
+              tick_spacing="128.f"
+              label_spacing="256.f" 
+              show_per_sec="false"
+              show_bar="false"
+              show_mean="false" >
+          </stat_bar>
+        </stat_view>
+
+        <stat_bar
+            name="simagentups"
+            label="Agent Updates/Sec"
+            stat="simagentups"
+            precision="1"
+            bar_min="0.f"
+            bar_max="100.f" 
+            tick_spacing="25.f"
+            label_spacing="50.f" 
+            show_per_sec="false"
+            show_bar="false"
+            show_mean="false" >
+        </stat_bar>
+
+        <stat_bar
+            name="simmainagents"
+            label="Main Agents"
+            stat="simmainagents"
+            precision="0"
+            bar_min="0.f"
+            bar_max="80.f" 
+            tick_spacing="10.f"
+            label_spacing="40.f" 
+            show_per_sec="false"
+            show_bar="false"
+            show_mean="false" >
+        </stat_bar>
+
+        <stat_bar
+            name="simchildagents"
+            label="Child Agents"
+            stat="simchildagents"
+            precision="0"
+            bar_min="0.f"
+            bar_max="40.f" 
+            tick_spacing="5.f"
+            label_spacing="10.f" 
+            show_per_sec="false"
+            show_bar="false"
+            show_mean="false" >
+        </stat_bar>
+
+        <stat_bar
+            name="simobjects"
+            label="Objects"
+            stat="simobjects"
+            precision="0"
+            bar_min="0.f"
+            bar_max="30000.f" 
+            tick_spacing="5000.f"
+            label_spacing="10000.f" 
+            show_per_sec="false"
+            show_bar="false"
+            show_mean="false" >
         </stat_bar>
-			</stat_view>
-        <!--Network Stats-->
-			<stat_view
-			   name="network"
-			   label="Network"
-			   show_label="true"
-			   setting="OpenDebugStatNet">
-			  <stat_bar
-				 name="packetsinstat"
-				 label="Packets In"
-				 stat="packetsinstat"
-				 unit_label="/sec" 
-         bar_min="0.f"
-				 bar_max="1024.f" 
-				 tick_spacing="128.f"
-				 label_spacing="256.f" 
-				 precision="1"
-				 show_bar="false">
-			  </stat_bar>
-
-			  <stat_bar
-				 name="packetsoutstat"
-				 label="Packets Out"
-				 stat="packetsoutstat"
-				 unit_label="/sec"  
-         bar_min="0.f"
-				 bar_max="1024.f" 
-				 tick_spacing="128.f"
-				 label_spacing="256.f" 
-				 precision="1"
-				 show_bar="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="objectkbitstat"
-				 label="Objects"
-				 stat="objectkbitstat"
-         unit_label="kbps"
-         bar_min="0.f"
-         bar_max="1024.f"
-         tick_spacing="128.f"
-         label_spacing="256.f"
-         precision="1"
-				 show_bar="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="texturekbitstat"
-				 label="Texture"
-				 stat="texturekbitstat"
-         unit_label="kbps"
-         bar_min="0.f"
-         bar_max="1024.f"
-         tick_spacing="128.f"
-         label_spacing="256.f"
-         precision="1"
-				 show_bar="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="assetkbitstat"
-				 label="Asset"
-				 stat="assetkbitstat"
-         unit_label="kbps"
-         bar_min="0.f"
-         bar_max="1024.f"
-         tick_spacing="128.f"
-         label_spacing="256.f"
-         precision="1"
-				 show_bar="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="layerskbitstat"
-				 label="Layers"
-				 stat="layerskbitstat"
-         unit_label="kbps"
-         bar_min="0.f"
-         bar_max="1024.f"
-         tick_spacing="128.f"
-         label_spacing="256.f"
-         precision="1"
-				 show_bar="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="actualinkbitstat"
-				 label="Actual In"
-				 stat="actualinkbitstat"
-         unit_label="kbps"
-         bar_min="0.f"
-         bar_max="1024.f"
-         tick_spacing="128.f"
-         label_spacing="256.f"
-         precision="1"
-				 show_bar="false"
-				 show_history="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="actualoutkbitstat"
-				 label="Actual Out"
-				 stat="actualoutkbitstat"
-         unit_label="kbps"
-         bar_min="0.f"
-         bar_max="1024.f"
-         tick_spacing="128.f"
-         label_spacing="256.f"
-         precision="1"
-				 show_bar="false"
-				 show_history="false">
-			  </stat_bar>
-
-			  <stat_bar
-				 name="vfspendingoperations"
-				 label="VFS Pending Operations"
-				 stat="vfspendingoperations"
-				 unit_label=" Ops."
-				 show_per_sec="false"
-				 show_bar="false" >
-			  </stat_bar>
-			</stat_view>
-		  </stat_view>
-        <!--Sim Stats-->
-		  <stat_view
-			 name="sim"
-			 label="Simulator"
-			 show_label="true"
-			 setting="OpenDebugStatSim">
-			<stat_bar
-			   name="simtimedilation"
-			   label="Time Dilation"
-			   stat="simtimedilation"
-			   precision="3"
-			   bar_min="0.f"
-			   bar_max="1.f" 
-			   tick_spacing="0.16666f"
-			   label_spacing="0.33333f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simfps"
-			   label="Sim FPS"
-			   stat="simfps"
-			   precision="1"
-			   bar_min="0.f"
-			   bar_max="45.f" 
-			   tick_spacing="7.5f"
-			   label_spacing="15.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simphysicsfps"
-			   label="Physics FPS"
-			   stat="simphysicsfps"
-			   precision="1"
-			   bar_min="0.f"
-			   bar_max="45.f" 
-			   tick_spacing="7.5.f"
-			   label_spacing="15.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_view
-			   name="physicsdetail"
-			   label="Physics Details"
-			   show_label="true">
-			  <stat_bar
-				 name="physicspinnedtasks"
-				 label="Pinned Objects"
-				 stat="physicspinnedtasks"
-				 precision="0" 
-				 bar_min="0.f"
-				 bar_max="500.f" 
-				 tick_spacing="50.f"
-				 label_spacing="100.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="physicslodtasks"
-				 label="Low LOD Objects"
-				 stat="physicslodtasks"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="500.f" 
-				 tick_spacing="50.f"
-				 label_spacing="100.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="physicsmemoryallocated"
-				 label="Memory Allocated"
-				 stat="physicsmemoryallocated"
-				 unit_label="MB"
-				 precision="1"
-				 bar_min="0.f"
-				 bar_max="1024.f" 
-				 tick_spacing="128.f"
-				 label_spacing="256.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-		  </stat_view>
-
-			<stat_bar
-			   name="simagentups"
-			   label="Agent Updates/Sec"
-			   stat="simagentups"
-			   precision="1"
-			   bar_min="0.f"
-			   bar_max="100.f" 
-			   tick_spacing="25.f"
-			   label_spacing="50.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simmainagents"
-			   label="Main Agents"
-			   stat="simmainagents"
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="80.f" 
-			   tick_spacing="10.f"
-			   label_spacing="40.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simchildagents"
-			   label="Child Agents"
-			   stat="simchildagents"
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="40.f" 
-			   tick_spacing="5.f"
-			   label_spacing="10.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simobjects"
-			   label="Objects"
-			   stat="simobjects"
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="30000.f" 
-			   tick_spacing="5000.f"
-			   label_spacing="10000.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simactiveobjects"
-			   label="Active Objects"
-			   stat="simactiveobjects"
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="5000.f" 
-			   tick_spacing="750.f"
-			   label_spacing="1250.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simactivescripts"
-			   label="Active Scripts"
-			   stat="simactivescripts"
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="15000.f" 
-			   tick_spacing="1875.f"
-			   label_spacing="3750.f"  
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simscripteps"
-			   label="Script Events"
-			   stat="simscripteps"
-			   unit_label="eps"
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="5000.f" 
-			   tick_spacing="750.f"
-			   label_spacing="1250.f"  
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="siminpps"
-			   label="Packets In"
-			   stat="siminpps"
-			   unit_label="pps"
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="2000.f" 
-			   tick_spacing="250.f"
-			   label_spacing="1000.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simoutpps"
-			   label="Packets Out"
-			   stat="simoutpps"
-			   unit_label="pps" 
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="2000.f" 
-			   tick_spacing="250.f"
-			   label_spacing="1000.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simpendingdownloads"
-			   label="Pending Downloads"
-			   stat="simpendingdownloads"
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="800.f" 
-			   tick_spacing="100.f"
-			   label_spacing="200.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simpendinguploads"
-			   label="Pending Uploads"
-			   stat="simpendinguploads"
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="100.f" 
-			   tick_spacing="25.f"
-			   label_spacing="50.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simtotalunackedbytes"
-			   label="Total Unacked Bytes"
-			   stat="simtotalunackedbytes"
-			   unit_label="kb"
-			   precision="1"
-			   bar_min="0.f"
-			   bar_max="100000.f" 
-			   tick_spacing="25000.f"
-			   label_spacing="50000.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_view
-			   name="simperf"
-			   label="Time (ms)"
-			   show_label="true">
-			  <stat_bar
-				 name="simframemsec"
-				 label="Total Frame Time"
-				 stat="simframemsec"
-				 unit_label="ms"
-				 precision="3"
-				 bar_min="0.f"
-				 bar_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="simnetmsec"
-				 label="Net Time"
-				 stat="simnetmsec"
-				 unit_label="ms"
-				 precision="3"
-				 bar_min="0.f"
-				 bar_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="simsimphysicsmsec"
-				 label="Physics Time"
-				 stat="simsimphysicsmsec"
-				 unit_label="ms"
-				 precision="3"
-				 bar_min="0.f"
-				 bar_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="simsimothermsec"
-				 label="Simulation Time"
-				 stat="simsimothermsec"
-				 unit_label="ms"
-				 precision="3"
-				 bar_min="0.f"
-				 bar_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="simagentmsec"
-				 label="Agent Time"
-				 stat="simagentmsec"
-				 unit_label="ms"
-				 precision="3"
-				 bar_min="0.f"
-				 bar_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="simimagesmsec"
-				 label="Images Time"
-				 stat="simimagesmsec"
-				 unit_label="ms"
-				 precision="3"
-				 bar_min="0.f"
-				 bar_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="simscriptmsec"
-				 label="Script Time"
-				 stat="simscriptmsec"
-				 unit_label="ms"
-				 precision="3"
-				 bar_min="0.f"
-				 bar_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
 
         <stat_bar
-         name="simsparemsec"
-         label="Spare Time"
-         stat="simsparemsec"
-         unit_label="ms"
-         precision="3"
-         bar_min="0.f"
-         bar_max="40.f"
-         tick_spacing="10.f"
-         label_spacing="20.f"
-         show_per_sec="false"
-         show_bar="false"
-         show_mean="false" >
+            name="simactiveobjects"
+            label="Active Objects"
+            stat="simactiveobjects"
+            precision="0"
+            bar_min="0.f"
+            bar_max="5000.f" 
+            tick_spacing="750.f"
+            label_spacing="1250.f" 
+            show_per_sec="false"
+            show_bar="false"
+            show_mean="false" >
         </stat_bar>
-        <!--2nd level time blocks under 'Details' second-->
+
+        <stat_bar
+            name="simactivescripts"
+            label="Active Scripts"
+            stat="simactivescripts"
+            precision="0"
+            bar_min="0.f"
+            bar_max="15000.f" 
+            tick_spacing="1875.f"
+            label_spacing="3750.f"  
+            show_per_sec="false"
+            show_bar="false"
+            show_mean="false" >
+        </stat_bar>
+        <stat_bar
+            name="simpctscriptsrun"
+            label="Scripts Run"
+            unit_label=" %"
+            stat="simpctscriptsrun"
+            bar_min="0"
+            bar_max="100"
+            tick_spacing="10"
+            label_spacing="20"
+            precision="3"
+            show_per_sec="false"
+            show_bar="false"
+            show_mean="true">
+        </stat_bar>
+
+        <stat_bar
+            name="simscripteps"
+            label="Script Events"
+            stat="simscripteps"
+            unit_label="eps"
+            precision="0"
+            bar_min="0.f"
+            bar_max="5000.f" 
+            tick_spacing="750.f"
+            label_spacing="1250.f"  
+            show_per_sec="false"
+            show_bar="false"
+            show_mean="false" >
+        </stat_bar>
+
+        <stat_view
+            name="simpathfinding"
+            label="Pathfinding"
+            show_label="true">
+          <stat_bar
+              name="simsimaistepmsec"
+              label="  AI Step Time"
+              stat="simsimaistepmsec"
+              unit_label="ms"
+              precision="3"
+              bar_min="0.f"
+              bar_max="40.f"
+              tick_spacing="10.f"
+              label_spacing="20.f"
+              show_per_sec="false"
+              show_bar="false"
+              show_mean="false" >
+          </stat_bar>
+          <stat_bar
+              name="simsimskippedsilhouettesteps"
+              label="  Skipped Silhouette Steps"
+              stat="simsimskippedsilhouettesteps"
+              unit_label="/sec"
+              precision="0"
+              bar_min="0"
+              bar_max="45"
+              tick_spacing="4"
+              label_spacing="8"
+              show_per_sec="false"
+              show_bar="false">
+          </stat_bar>
+          <stat_bar
+              name="simsimpctsteppedcharacters"
+              label="  Characters Updated"
+              unit_label=" %"
+              stat="simsimpctsteppedcharacters"
+              bar_min="0"
+              bar_max="100"
+              tick_spacing="10"
+              label_spacing="20"
+              precision="3"
+              show_per_sec="false"
+              show_bar="false"
+              show_mean="true">
+          </stat_bar>
+        </stat_view>
+
+        <stat_bar
+            name="siminpps"
+            label="Packets In"
+            stat="siminpps"
+            unit_label="pps"
+            precision="0"
+            bar_min="0.f"
+            bar_max="2000.f" 
+            tick_spacing="250.f"
+            label_spacing="1000.f" 
+            show_per_sec="false"
+            show_bar="false"
+            show_mean="false" >
+        </stat_bar>
+
+        <stat_bar
+            name="simoutpps"
+            label="Packets Out"
+            stat="simoutpps"
+            unit_label="pps" 
+            precision="0"
+            bar_min="0.f"
+            bar_max="2000.f" 
+            tick_spacing="250.f"
+            label_spacing="1000.f" 
+            show_per_sec="false"
+            show_bar="false"
+            show_mean="false" >
+        </stat_bar>
+
+        <stat_bar
+            name="simpendingdownloads"
+            label="Pending Downloads"
+            stat="simpendingdownloads"
+            precision="0"
+            bar_min="0.f"
+            bar_max="800.f" 
+            tick_spacing="100.f"
+            label_spacing="200.f" 
+            show_per_sec="false"
+            show_bar="false"
+            show_mean="false" >
+        </stat_bar>
+
+        <stat_bar
+            name="simpendinguploads"
+            label="Pending Uploads"
+            stat="simpendinguploads"
+            precision="0"
+            bar_min="0.f"
+            bar_max="100.f" 
+            tick_spacing="25.f"
+            label_spacing="50.f" 
+            show_per_sec="false"
+            show_bar="false"
+            show_mean="false" >
+        </stat_bar>
+
+        <stat_bar
+            name="simtotalunackedbytes"
+            label="Total Unacked Bytes"
+            stat="simtotalunackedbytes"
+            unit_label="kb"
+            precision="1"
+            bar_min="0.f"
+            bar_max="100000.f" 
+            tick_spacing="25000.f"
+            label_spacing="50000.f" 
+            show_per_sec="false"
+            show_bar="false"
+            show_mean="false" >
+        </stat_bar>
+
+        <stat_view
+            name="simperf"
+            label="Time (ms)"
+            show_label="true">
+          <stat_bar
+              name="simframemsec"
+              label="Total Frame Time"
+              stat="simframemsec"
+              unit_label="ms"
+              precision="3"
+              bar_min="0.f"
+              bar_max="40.f" 
+              tick_spacing="10.f"
+              label_spacing="20.f" 
+              show_per_sec="false"
+              show_bar="false"
+              show_mean="false" >
+          </stat_bar>
+
+          <stat_bar
+              name="simnetmsec"
+              label="Net Time"
+              stat="simnetmsec"
+              unit_label="ms"
+              precision="3"
+              bar_min="0.f"
+              bar_max="40.f" 
+              tick_spacing="10.f"
+              label_spacing="20.f" 
+              show_per_sec="false"
+              show_bar="false"
+              show_mean="false" >
+          </stat_bar>
+
+          <stat_bar
+              name="simsimphysicsmsec"
+              label="Physics Time"
+              stat="simsimphysicsmsec"
+              unit_label="ms"
+              precision="3"
+              bar_min="0.f"
+              bar_max="40.f" 
+              tick_spacing="10.f"
+              label_spacing="20.f" 
+              show_per_sec="false"
+              show_bar="false"
+              show_mean="false" >
+          </stat_bar>
+
+          <stat_bar
+              name="simsimothermsec"
+              label="Simulation Time"
+              stat="simsimothermsec"
+              unit_label="ms"
+              precision="3"
+              bar_min="0.f"
+              bar_max="40.f" 
+              tick_spacing="10.f"
+              label_spacing="20.f" 
+              show_per_sec="false"
+              show_bar="false"
+              show_mean="false" >
+          </stat_bar>
+
+          <stat_bar
+              name="simagentmsec"
+              label="Agent Time"
+              stat="simagentmsec"
+              unit_label="ms"
+              precision="3"
+              bar_min="0.f"
+              bar_max="40.f" 
+              tick_spacing="10.f"
+              label_spacing="20.f" 
+              show_per_sec="false"
+              show_bar="false"
+              show_mean="false" >
+          </stat_bar>
+
+          <stat_bar
+              name="simimagesmsec"
+              label="Images Time"
+              stat="simimagesmsec"
+              unit_label="ms"
+              precision="3"
+              bar_min="0.f"
+              bar_max="40.f" 
+              tick_spacing="10.f"
+              label_spacing="20.f" 
+              show_per_sec="false"
+              show_bar="false"
+              show_mean="false" >
+          </stat_bar>
+
+          <stat_bar
+              name="simscriptmsec"
+              label="Script Time"
+              stat="simscriptmsec"
+              unit_label="ms"
+              precision="3"
+              bar_min="0.f"
+              bar_max="40.f" 
+              tick_spacing="10.f"
+              label_spacing="20.f" 
+              show_per_sec="false"
+              show_bar="false"
+              show_mean="false" >
+          </stat_bar>
+
+          <stat_bar
+              name="simsparemsec"
+              label="Spare Time"
+              stat="simsparemsec"
+              unit_label="ms"
+              precision="3"
+              bar_min="0.f"
+              bar_max="40.f"
+              tick_spacing="10.f"
+              label_spacing="20.f"
+              show_per_sec="false"
+              show_bar="false"
+              show_mean="false" >
+          </stat_bar>
+          <!--2nd level time blocks under 'Details' second-->
           <stat_view
- 			     name="timedetails"
-			     label="Time Details (ms)"
-			     show_label="true">
+              name="timedetails"
+              label="Time Details (ms)"
+              show_label="true">
             <stat_bar
-             name="simsimphysicsstepmsec"
-             label="  Physics Step"
-             stat="simsimphysicsstepmsec"
-             unit_label="ms"
-             precision="3"
-             bar_min="0.f"
-             bar_max="40.f"
-             tick_spacing="10.f"
-             label_spacing="20.f"
-             show_per_sec="false"
-             show_bar="false"
-             show_mean="false" >
+                name="simsimphysicsstepmsec"
+                label="  Physics Step"
+                stat="simsimphysicsstepmsec"
+                unit_label="ms"
+                precision="3"
+                bar_min="0.f"
+                bar_max="40.f"
+                tick_spacing="10.f"
+                label_spacing="20.f"
+                show_per_sec="false"
+                show_bar="false"
+                show_mean="false" >
             </stat_bar>
             <stat_bar
-             name="simsimphysicsshapeupdatemsec"
-             label="  Update Phys Shapes"
-             stat="simsimphysicsshapeupdatemsec"
-             unit_label="ms"
-             precision="3"
-             bar_min="0.f"
-             bar_max="40.f"
-             tick_spacing="10.f"
-             label_spacing="20.f"
-             show_per_sec="false"
-             show_bar="false"
-             show_mean="false" >
+                name="simsimphysicsshapeupdatemsec"
+                label="  Update Phys Shapes"
+                stat="simsimphysicsshapeupdatemsec"
+                unit_label="ms"
+                precision="3"
+                bar_min="0.f"
+                bar_max="40.f"
+                tick_spacing="10.f"
+                label_spacing="20.f"
+                show_per_sec="false"
+                show_bar="false"
+                show_mean="false" >
             </stat_bar>
             <stat_bar
-             name="simsimphysicsothermsec"
-             label="  Physics Other"
-             stat="simsimphysicsothermsec"
-             unit_label="ms"
-             precision="3"
-             bar_min="0.f"
-             bar_max="40.f"
-             tick_spacing="10.f"
-             label_spacing="20.f"
-             show_per_sec="false"
-             show_bar="false"
-             show_mean="false" >
+                name="simsimphysicsothermsec"
+                label="  Physics Other"
+                stat="simsimphysicsothermsec"
+                unit_label="ms"
+                precision="3"
+                bar_min="0.f"
+                bar_max="40.f"
+                tick_spacing="10.f"
+                label_spacing="20.f"
+                show_per_sec="false"
+                show_bar="false"
+                show_mean="false" >
             </stat_bar>
             <stat_bar
-             name="simsleepmsec"
-             label="  Sleep Time"
-             stat="simsleepmsec"
-             unit_label="ms"
-             precision="3"
-             bar_min="0.f"
-             bar_max="40.f"
-             tick_spacing="10.f"
-             label_spacing="20.f"
-             show_per_sec="false"
-             show_bar="false"
-             show_mean="false" >
+                name="simsleepmsec"
+                label="  Sleep Time"
+                stat="simsleepmsec"
+                unit_label="ms"
+                precision="3"
+                bar_min="0.f"
+                bar_max="40.f"
+                tick_spacing="10.f"
+                label_spacing="20.f"
+                show_per_sec="false"
+                show_bar="false"
+                show_mean="false" >
             </stat_bar>
             <stat_bar
-             name="simpumpiomsec"
-             label="  Pump IO"
-             stat="simpumpiomsec"
-             unit_label="ms"
-             precision="3"
-             bar_min="0.f"
-             bar_max="40.f"
-             tick_spacing="10.f"
-             label_spacing="20.f"
-             show_per_sec="false"
-             show_bar="false"
-             show_mean="false" >
+                name="simpumpiomsec"
+                label="  Pump IO"
+                stat="simpumpiomsec"
+                unit_label="ms"
+                precision="3"
+                bar_min="0.f"
+                bar_max="40.f"
+                tick_spacing="10.f"
+                label_spacing="20.f"
+                show_per_sec="false"
+                show_bar="false"
+                show_mean="false" >
             </stat_bar>
-			</stat_view>
-			</stat_view>
-		  </stat_view>
-		</container_view>
-    </scroll_container>
+          </stat_view>
+        </stat_view>
+      </stat_view>
+    </container_view>
+  </scroll_container>
 </floater>
-- 
cgit v1.2.3


From 92237efb16a6bcdb3bea2e320dbea33f302c00d3 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 22 May 2012 14:18:53 -0700
Subject: PATH-638: Tweaking the percentage stepped characters multiplying by
 100 as the server range was different from expected.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index 003a92e37a..464f7fcfe9 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -602,7 +602,7 @@
               bar_max="100"
               tick_spacing="10"
               label_spacing="20"
-              precision="3"
+              precision="1"
               show_per_sec="false"
               show_bar="false"
               show_mean="true">
-- 
cgit v1.2.3


From 3c2be426e5e905076d00b9492c0e66c8b31caf19 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 30 May 2012 18:47:12 -0700
Subject: First pass at refactoring the pathfinding linksets and pathfinding
 characters classes to reduce code duplication, as both functionalities were
 heavily duplicated.

---
 .../xui/en/floater_pathfinding_characters.xml      | 34 ++++++++++----------
 .../xui/en/floater_pathfinding_linksets.xml        | 36 +++++++++++-----------
 2 files changed, 36 insertions(+), 34 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
index 16b4a70b93..a81c4cb891 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -14,12 +14,14 @@
     save_rect="false"
     single_instance="true"
     title="Pathfinding characters">
-  <floater.string name="characters_messaging_initial"></floater.string>
-  <floater.string name="characters_messaging_get_inprogress">Querying for pathfinding characters ...</floater.string>
-  <floater.string name="characters_messaging_get_error">Error detected while querying for pathfinding characters.</floater.string>
-  <floater.string name="characters_messaging_complete_none_found">No pathfinding characters.</floater.string>
-  <floater.string name="characters_messaging_complete_available">[NUM_SELECTED] characters selected out of [NUM_TOTAL].</floater.string>
-  <floater.string name="characters_messaging_not_enabled">This region is not enabled for pathfinding.</floater.string>
+  <floater.string name="messaging_initial"></floater.string>
+  <floater.string name="messaging_get_inprogress">Querying for pathfinding characters ...</floater.string>
+  <floater.string name="messaging_get_error">Error detected while querying for pathfinding characters.</floater.string>
+  <floater.string name="messaging_set_inprogress"></floater.string>
+  <floater.string name="messaging_set_error"></floater.string>
+  <floater.string name="messaging_complete_none_found">No pathfinding characters.</floater.string>
+  <floater.string name="messaging_complete_available">[NUM_SELECTED] characters selected out of [NUM_TOTAL].</floater.string>
+  <floater.string name="messaging_not_enabled">This region is not enabled for pathfinding.</floater.string>
   <floater.string name="character_cpu_time">[CPU_TIME] µs</floater.string>
   <panel
       border="false"
@@ -38,7 +40,7 @@
         top_pad="10"
         tab_stop="false"
         multi_select="true"
-        name="pathfinding_characters"
+        name="objects_scroll_list"
         width="600">
       <scroll_list.columns
           label="Name"
@@ -70,7 +72,7 @@
         length="1"
         follows="left|bottom|right"
         layout="topleft"
-        name="characters_status"
+        name="messaging_status"
         top_pad="17"
         width="238">
       Characters:
@@ -80,7 +82,7 @@
         height="21"
         label="Refresh list"
         layout="topleft"
-        name="refresh_characters_list"
+        name="refresh_objects_list"
         top_pad="-29"
         left_pad="0"
         width="115"/>
@@ -89,7 +91,7 @@
         height="21"
         label="Select all"
         layout="topleft"
-        name="select_all_characters"
+        name="select_all_objects"
         top_pad="-21"
         left_pad="8"
         width="115"/>
@@ -98,7 +100,7 @@
         height="21"
         label="Select none"
         layout="topleft"
-        name="select_none_characters"
+        name="select_none_objects"
         top_pad="-21"
         left_pad="8"
         width="115"/>
@@ -150,7 +152,7 @@
         height="22"
         label="Take"
         layout="topleft"
-        name="take_characters"
+        name="take_objects"
         top_pad="9"
         left="18"
         width="94"/>
@@ -159,7 +161,7 @@
         height="22"
         label="Take copy"
         layout="topleft"
-        name="take_copy_characters"
+        name="take_copy_objects"
         top_pad="-22"
         left_pad="6"
         width="94"/>
@@ -168,7 +170,7 @@
         height="22"
         label="Return"
         layout="topleft"
-        name="return_characters"
+        name="return_objects"
         top_pad="-22"
         left_pad="6"
         width="94"/>
@@ -177,7 +179,7 @@
         height="22"
         label="Delete"
         layout="topleft"
-        name="delete_characters"
+        name="delete_objects"
         top_pad="-22"
         left_pad="6"
         width="94"/>
@@ -186,7 +188,7 @@
         height="22"
         label="Teleport me to it"
         layout="topleft"
-        name="teleport_to_character"
+        name="teleport_me_to_object"
         tool_tip="Enabled only when one character is selected."
         top_pad="-22"
         left_pad="6"
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 b4e367690c..3ae5301cc2 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -14,14 +14,14 @@
     save_rect="false"
     single_instance="true"
     title="Pathfinding linksets">
-  <floater.string name="linksets_messaging_initial"></floater.string>
-  <floater.string name="linksets_messaging_get_inprogress">Querying for pathfinding linksets ...</floater.string>
-  <floater.string name="linksets_messaging_get_error">Error detected while querying for pathfinding linksets.</floater.string>
-  <floater.string name="linksets_messaging_set_inprogress">Modifying selected pathfinding linksets ...</floater.string>
-  <floater.string name="linksets_messaging_set_error">Error detected while modifying selected pathfinding linksets.</floater.string>
-  <floater.string name="linksets_messaging_complete_none_found">No pathfinding linksets.</floater.string>
-  <floater.string name="linksets_messaging_complete_available">[NUM_SELECTED] linksets selected out of [NUM_TOTAL].</floater.string>
-  <floater.string name="linksets_messaging_not_enabled">This region is not enabled for pathfinding.</floater.string>
+  <floater.string name="messaging_initial"></floater.string>
+  <floater.string name="messaging_get_inprogress">Querying for pathfinding linksets ...</floater.string>
+  <floater.string name="messaging_get_error">Error detected while querying for pathfinding linksets.</floater.string>
+  <floater.string name="messaging_set_inprogress">Modifying selected pathfinding linksets ...</floater.string>
+  <floater.string name="messaging_set_error">Error detected while modifying selected pathfinding linksets.</floater.string>
+  <floater.string name="messaging_complete_none_found">No pathfinding linksets.</floater.string>
+  <floater.string name="messaging_complete_available">[NUM_SELECTED] linksets selected out of [NUM_TOTAL].</floater.string>
+  <floater.string name="messaging_not_enabled">This region is not enabled for pathfinding.</floater.string>
   <floater.string name="linkset_terrain_name">[Terrain]</floater.string>
   <floater.string name="linkset_terrain_description">--</floater.string>
   <floater.string name="linkset_terrain_owner">--</floater.string>
@@ -174,7 +174,7 @@
         top_pad="15"
         tab_stop="false"
         multi_select="true"
-        name="pathfinding_linksets"
+        name="objects_scroll_list"
         width="980">
       <scroll_list.columns
           label="Name (root prim)"
@@ -226,7 +226,7 @@
         length="1"
         follows="left|bottom|right"
         layout="topleft"
-        name="linksets_status"
+        name="messaging_status"
         top_pad="17"
         width="619">
       Linksets:
@@ -236,7 +236,7 @@
         height="21"
         label="Refresh list"
         layout="topleft"
-        name="refresh_linksets_list"
+        name="refresh_objects_list"
         top_pad="-16"
         left_pad="0"
         width="115"/>
@@ -245,7 +245,7 @@
         height="21"
         label="Select all"
         layout="topleft"
-        name="select_all_linksets"
+        name="select_all_objects"
         top_pad="-21"
         left_pad="8"
         width="115"/>
@@ -254,7 +254,7 @@
         height="21"
         label="Select none"
         layout="topleft"
-        name="select_none_linksets"
+        name="select_none_objects"
         top_pad="-21"
         left_pad="8"
         width="115"/>
@@ -305,7 +305,7 @@
         height="21"
         label="Take"
         layout="topleft"
-        name="take_linksets"
+        name="take_objects"
         top_pad="9"
         left="18"
         width="95"/>
@@ -314,7 +314,7 @@
         height="21"
         label="Take copy"
         layout="topleft"
-        name="take_copy_linksets"
+        name="take_copy_objects"
         top_pad="-21"
         left_pad="6"
         width="95"/>
@@ -323,7 +323,7 @@
         height="21"
         label="Return"
         layout="topleft"
-        name="return_linksets"
+        name="return_objects"
         top_pad="-21"
         left_pad="6"
         width="95"/>
@@ -332,7 +332,7 @@
         height="21"
         label="Delete"
         layout="topleft"
-        name="delete_linksets"
+        name="delete_objects"
         top_pad="-21"
         left_pad="6"
         width="95"/>
@@ -341,7 +341,7 @@
         height="21"
         label="Teleport me to it"
         layout="topleft"
-        name="teleport_me_to_linkset"
+        name="teleport_me_to_object"
         top_pad="-21"
         left_pad="6"
         width="160"/>
-- 
cgit v1.2.3


From ef75a2e07ec4f26c9126c04af1adfbd28d7eaa9b Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Thu, 31 May 2012 16:38:19 -0400
Subject: WIP:Displaying physics capsule for a character - it is currently
 disabled.

---
 .../skins/default/xui/en/floater_pathfinding_characters.xml      | 9 +++++++++
 .../skins/default/xui/en/floater_pathfinding_linksets.xml        | 9 +++++++++
 2 files changed, 18 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
index a81c4cb891..fac6ee05bb 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -147,6 +147,15 @@
         top_pad="-16"
         left_pad="0"
         width="90" />
+    <check_box
+     height="19"
+     follows="left|bottom"
+     label="Show physics capsule"
+     layout="topleft"
+     name="show_physics_capsule"
+     top_pad="-19"
+     left_pad="10"
+     width="90" />
     <button
         follows="left|bottom"
         height="22"
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 3ae5301cc2..063aa7bef0 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -300,6 +300,15 @@
         left_pad="0"
         top_pad="-16"
         width="90" />
+    <check_box
+     height="19"
+     follows="left|bottom"
+     label="Show physics capsule"
+     layout="topleft"
+     name="show_physics_capsule"
+     top_pad="-19"
+     left_pad="10"
+     width="90" />
     <button
         follows="left|bottom"
         height="21"
-- 
cgit v1.2.3


From a8ff37b95609148c60ddda9acfca65b2b89d6b9d Mon Sep 17 00:00:00 2001
From: prep <none@none>
Date: Fri, 1 Jun 2012 15:48:19 -0400
Subject: Migrated physics capsule logic into pathing character object

---
 .../skins/default/xui/en/floater_pathfinding_linksets.xml        | 9 ---------
 1 file changed, 9 deletions(-)

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

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 063aa7bef0..3ae5301cc2 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -300,15 +300,6 @@
         left_pad="0"
         top_pad="-16"
         width="90" />
-    <check_box
-     height="19"
-     follows="left|bottom"
-     label="Show physics capsule"
-     layout="topleft"
-     name="show_physics_capsule"
-     top_pad="-19"
-     left_pad="10"
-     width="90" />
     <button
         follows="left|bottom"
         height="21"
-- 
cgit v1.2.3


From ea23285f8b728bf52c8490610c610f4abd2d6957 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 4 Jun 2012 14:36:43 -0700
Subject: Ensuring that the scroll list is rebuilt after any missing avatar
 names are loaded into cache.

---
 indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml | 2 ++
 indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml   | 1 +
 2 files changed, 3 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
index fac6ee05bb..054b2674f2 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -23,6 +23,8 @@
   <floater.string name="messaging_complete_available">[NUM_SELECTED] characters selected out of [NUM_TOTAL].</floater.string>
   <floater.string name="messaging_not_enabled">This region is not enabled for pathfinding.</floater.string>
   <floater.string name="character_cpu_time">[CPU_TIME] µs</floater.string>
+  <floater.string name="character_owner_loading">[Loading]</floater.string>
+  <floater.string name="character_owner_unknown">Unknown</floater.string>
   <panel
       border="false"
       bevel_style="none"
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 3ae5301cc2..3e718743dc 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -27,6 +27,7 @@
   <floater.string name="linkset_terrain_owner">--</floater.string>
   <floater.string name="linkset_terrain_land_impact">--</floater.string>
   <floater.string name="linkset_terrain_dist_from_you">--</floater.string>
+  <floater.string name="linkset_owner_loading">[Loading]</floater.string>
   <floater.string name="linkset_owner_unknown">Unknown</floater.string>
   <floater.string name="linkset_use_walkable">Walkable</floater.string>
   <floater.string name="linkset_use_static_obstacle">Static obstacle</floater.string>
-- 
cgit v1.2.3


From 3b8b8a0d09042754afc3829e8f5f7fb54f682bd2 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 4 Jun 2012 17:36:06 -0700
Subject: Adding more space to allow for translated copy on the pathfinding
 characters floater.

---
 .../newview/skins/default/xui/en/floater_pathfinding_characters.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
index 054b2674f2..a267902b94 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -148,7 +148,7 @@
         name="show_beacon"
         top_pad="-16"
         left_pad="0"
-        width="90" />
+        width="150" />
     <check_box
      height="19"
      follows="left|bottom"
@@ -156,8 +156,8 @@
      layout="topleft"
      name="show_physics_capsule"
      top_pad="-19"
-     left_pad="10"
-     width="90" />
+     left_pad="0"
+     width="150" />
     <button
         follows="left|bottom"
         height="22"
-- 
cgit v1.2.3