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')

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')

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')

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.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 8702ebde2a..c082cf6ca4 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -137,6 +137,7 @@ with the same filename but different name
   <texture name="Command_MiniCart_Icon"     file_name="toolbar_icons/mini_cart.png"    preload="true" />
   <texture name="Command_MiniMap_Icon"      file_name="toolbar_icons/mini_map.png"     preload="true" />
   <texture name="Command_Move_Icon"         file_name="toolbar_icons/move.png"         preload="true" />
+  <texture name="Command_Pathfinding_Icon"  file_name="toolbar_icons/land.png"         preload="true" />
   <texture name="Command_People_Icon"       file_name="toolbar_icons/people.png"       preload="true" />
   <texture name="Command_Picks_Icon"        file_name="toolbar_icons/picks.png"        preload="true" />
   <texture name="Command_Places_Icon"       file_name="toolbar_icons/places.png"       preload="true" />
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')

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')

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.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index c082cf6ca4..ee854d96e5 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -139,6 +139,7 @@ with the same filename but different name
   <texture name="Command_Move_Icon"         file_name="toolbar_icons/move.png"         preload="true" />
   <texture name="Command_Pathfinding_Icon"  file_name="toolbar_icons/land.png"         preload="true" />
   <texture name="Command_People_Icon"       file_name="toolbar_icons/people.png"       preload="true" />
+  <texture name="Command_PF_Linksets_Icon"  file_name="toolbar_icons/land.png"         preload="true" />
   <texture name="Command_Picks_Icon"        file_name="toolbar_icons/picks.png"        preload="true" />
   <texture name="Command_Places_Icon"       file_name="toolbar_icons/places.png"       preload="true" />
   <texture name="Command_Preferences_Icon"  file_name="toolbar_icons/preferences.png"  preload="true" />
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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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.

---
 indra/newview/skins/default/textures/textures.xml  |   1 +
 .../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 +
 4 files changed, 177 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 9f14caa142..5eea581987 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -140,6 +140,7 @@ with the same filename but different name
   <texture name="Command_Outbox_Icon"       file_name="toolbar_icons/outbox.png"       preload="true" />
   <texture name="Command_Pathfinding_Icon"  file_name="toolbar_icons/land.png"         preload="true" />
   <texture name="Command_People_Icon"       file_name="toolbar_icons/people.png"       preload="true" />
+  <texture name="Command_PF_Characters_Icon" file_name="toolbar_icons/land.png"        preload="true" />
   <texture name="Command_PF_Linksets_Icon"  file_name="toolbar_icons/land.png"         preload="true" />
   <texture name="Command_Picks_Icon"        file_name="toolbar_icons/picks.png"        preload="true" />
   <texture name="Command_Places_Icon"       file_name="toolbar_icons/places.png"       preload="true" />
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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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.

---
 indra/newview/skins/default/textures/textures.xml  |  1 +
 .../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 +
 5 files changed, 69 insertions(+), 8 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 5eea581987..ee8b7ba082 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -140,6 +140,7 @@ with the same filename but different name
   <texture name="Command_Outbox_Icon"       file_name="toolbar_icons/outbox.png"       preload="true" />
   <texture name="Command_Pathfinding_Icon"  file_name="toolbar_icons/land.png"         preload="true" />
   <texture name="Command_People_Icon"       file_name="toolbar_icons/people.png"       preload="true" />
+  <texture name="Command_PF_Basic_Icon"     file_name="toolbar_icons/land.png"         preload="true" />
   <texture name="Command_PF_Characters_Icon" file_name="toolbar_icons/land.png"        preload="true" />
   <texture name="Command_PF_Linksets_Icon"  file_name="toolbar_icons/land.png"         preload="true" />
   <texture name="Command_Picks_Icon"        file_name="toolbar_icons/picks.png"        preload="true" />
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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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.

---
 indra/newview/skins/default/colors.xml             | 1601 ++++++++++----------
 .../default/xui/en/floater_pathfinding_console.xml |  423 +++---
 2 files changed, 1025 insertions(+), 999 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index b616e2327b..a39e1a0511 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -1,825 +1,840 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <colors>
 
-	<!-- Named Colors -->
-	<color
-	 name="EmphasisColor"
-	 value="0.38 0.694 0.573 1" />
-	<color
-	 name="EmphasisColor_13"
-	 value="0.38 0.694 0.573 0.13" />
-	<color
-	 name="EmphasisColor_35"
-	 value="0.38 0.694 0.573 0.35" />
-	<color
-	 name="White"
-	 value="1 1 1 1" />
-	<color
-	 name="White_05"
-	 value="1 1 1 0.05" />
-	<color
-	 name="White_10"
-	 value="1 1 1 0.1" />
-	<color
-	 name="White_25"
-	 value="1 1 1 0.25" />
-	<color
-	 name="White_50"
-	 value="1 1 1 0.5" />
-	<color
-	 name="LtGray"
-	 value="0.75 0.75 0.75 1" />
-	<color
-	 name="LtGray_35"
-	 value="0.75 0.75 0.75 0.35" />
-	<color
-	 name="LtGray_50"
-	 value="0.75 0.75 0.75 0.50" />
-	<color
-	 name="Gray"
-	 value="0.5 0.5 0.5 1" />
-	<color
-	 name="DkGray"
-	 value="0.125 0.125 0.125 1" />
-	<color
-	 name="DkGray_66"
-	 value="0.125 0.125 0.125 .66" />
-	<color
-	 name="DkGray2"
-	 value="0.169 0.169 0.169 1" />
-	<color
-	 name="MouseGray"
-	 value="0.191 0.191 0.191 1" />
-	<color
-	 name="Black"
-	 value="0 0 0 1" />
-	<colork
-	 name="Black_10"
-	 value="0 0 0 0.1" />
-	<color
-	 name="Black_25"
-	 value="0 0 0 0.25" />
-	<color
-	 name="Black_50"
-	 value="0 0 0 0.5" />
-	<color
-	name="FrogGreen"
-	value="0.26 0.345 0.263 1" />
-	<color
-	 name="Red"
-	 value="1 0 0 1" />
-	<color
-	 name="Blue"
-	 value="0 0 1 1" />
-	<color
-	 name="Yellow"
-	 value="1 1 0 1" />
-	<color
-	 name="Green"
-	 value="0 1 0 1" />
-	<color
-	 name="Transparent"
-	 value="0 0 0 0" />
-	<color
-	name="Purple"
-	value="1 0 1 1" />
-	<color
-	name="Lime"
-	value=".8 1 .73 1" />
-	<color
-	name="LtYellow"
-	value="1 1 .79 1" />
-	<color
-	name="DrYellow"
-	value="1 0.86 0 1" />
-	<color
-	name="LtOrange"
-	value="1 .85 .73 1" />
-	<color
-	name="MdBlue"
-	value=".07 .38 .51 1" />
+  <!-- Named Colors -->
+  <color
+      name="EmphasisColor"
+      value="0.38 0.694 0.573 1" />
+  <color
+      name="EmphasisColor_13"
+      value="0.38 0.694 0.573 0.13" />
+  <color
+      name="EmphasisColor_35"
+      value="0.38 0.694 0.573 0.35" />
+  <color
+      name="White"
+      value="1 1 1 1" />
+  <color
+      name="White_05"
+      value="1 1 1 0.05" />
+  <color
+      name="White_10"
+      value="1 1 1 0.1" />
+  <color
+      name="White_25"
+      value="1 1 1 0.25" />
+  <color
+      name="White_50"
+      value="1 1 1 0.5" />
+  <color
+      name="LtGray"
+      value="0.75 0.75 0.75 1" />
+  <color
+      name="LtGray_35"
+      value="0.75 0.75 0.75 0.35" />
+  <color
+      name="LtGray_50"
+      value="0.75 0.75 0.75 0.50" />
+  <color
+      name="Gray"
+      value="0.5 0.5 0.5 1" />
+  <color
+      name="DkGray"
+      value="0.125 0.125 0.125 1" />
+  <color
+      name="DkGray_66"
+      value="0.125 0.125 0.125 .66" />
+  <color
+      name="DkGray2"
+      value="0.169 0.169 0.169 1" />
+  <color
+      name="MouseGray"
+      value="0.191 0.191 0.191 1" />
+  <color
+      name="Black"
+      value="0 0 0 1" />
+  <colork
+      name="Black_10"
+      value="0 0 0 0.1" />
+  <color
+      name="Black_25"
+      value="0 0 0 0.25" />
+  <color
+      name="Black_50"
+      value="0 0 0 0.5" />
+  <color
+      name="FrogGreen"
+      value="0.26 0.345 0.263 1" />
+  <color
+      name="Red"
+      value="1 0 0 1" />
+  <color
+      name="Blue"
+      value="0 0 1 1" />
+  <color
+      name="Yellow"
+      value="1 1 0 1" />
+  <color
+      name="Green"
+      value="0 1 0 1" />
+  <color
+      name="Transparent"
+      value="0 0 0 0" />
+  <color
+      name="Purple"
+      value="1 0 1 1" />
+  <color
+      name="Lime"
+      value=".8 1 .73 1" />
+  <color
+      name="LtYellow"
+      value="1 1 .79 1" />
+  <color
+      name="DrYellow"
+      value="1 0.86 0 1" />
+  <color
+      name="LtOrange"
+      value="1 .85 .73 1" />
+  <color
+      name="MdBlue"
+      value=".07 .38 .51 1" />
+  <color
+      name="LtRed"
+      value="1 0.2 0.2 1" />
+  <color
+      name="LtGreen"
+      value="0.2 1 0.2 1" />
 
   <!-- This color name makes potentially unused colors show up bright purple.
-  Leave this here until all Unused? are removed below, otherwise
-  the viewer generates many warnings on startup. -->
+       Leave this here until all Unused? are removed below, otherwise
+       the viewer generates many warnings on startup. -->
   <color
-	 name="Unused?"
-	 value=".831 1 0 1" />
+      name="Unused?"
+      value=".831 1 0 1" />
 
   <!-- UI Definitions -->
 
-    <color
-     name="AccordionHeaderTextColor"
-     reference="LtGray" />
-    <color
-     name="AgentChatColor"
-     reference="White" />
-    <color
-     name="AlertBoxColor"
-     value="0.24 0.24 0.24 1" />
-    <color
-     name="AlertCautionBoxColor"
-     value="1 0.82 0.46 1" />
-    <color
-     name="AlertCautionTextColor"
-     reference="LtYellow" />
-    <color
-     name="AvatarListItemIconDefaultColor"
-     reference="White" />
-    <color
-     name="AvatarListItemIconOnlineColor"
-     reference="White" />
-    <color
-     name="AvatarListItemIconOfflineColor"
-     value="0.5 0.5 0.5 0.5" />
-    <color
-     name="AvatarListItemIconVoiceInvitedColor"
-     reference="AvatarListItemIconOfflineColor" />
-    <color
-     name="AvatarListItemIconVoiceJoinedColor"
-     reference="AvatarListItemIconOnlineColor" />
-    <color
-     name="AvatarListItemIconVoiceLeftColor"
-     reference="AvatarListItemIconOfflineColor" />
-    <color
-     name="BadgeImageColor"
-     value="1.0 0.40 0.0 1.0" />
-    <color
-     name="BadgeBorderColor"
-     value="0.9 0.9 0.9 1.0" />
-    <color
-     name="BadgeLabelColor"
-     reference="White" />
-    <color
-     name="ButtonBorderColor"
-     reference="Unused?" />
-    <color
-     name="ButtonCautionImageColor"
-     reference="Unused?" />
-    <color
-     name="ButtonColor"
-     reference="Unused?" />
-    <color
-     name="ButtonFlashBgColor"
-     reference="Unused?" />
-    <color
-     name="ButtonImageColor"
-     reference="White" />
-    <color
-     name="ButtonLabelColor"
-     reference="LtGray" />
-    <color
-     name="ButtonLabelDisabledColor"
-     reference="White_25" />
-    <color
-     name="ButtonLabelSelectedColor"
-     reference="White" />
-    <color
-     name="ButtonLabelSelectedDisabledColor"
-     reference="White_25" />
-    <color
-     name="ButtonSelectedBgColor"
-     reference="Unused?" />
-    <color
-     name="ButtonSelectedColor"
-     reference="Unused?" />
-    <color
-     name="ButtonUnselectedBgColor"
-     reference="Unused?" />
-    <color
-     name="ButtonUnselectedFgColor"
-     reference="Unused?" />
-    <color
-     name="ChatHistoryBgColor"
-     reference="Transparent" />
-    <color
-     name="ChatHistoryTextColor"
-     reference="LtGray" />
-    <color
-     name="ChicletFlashColor"
-     value="0.114 0.65 0.1" />
-    <color
-     name="ColorDropShadow"
-     reference="Black_50" />
-    <color
-     name="ColorPaletteEntry01"
-     reference="Black" />
-    <color
-     name="ColorPaletteEntry02"
-     reference="Gray" />
-    <color
-     name="ColorPaletteEntry03"
-     value="0.5 0 0 1" />
-    <color
-     name="ColorPaletteEntry04"
-     value="0.5 0.5 0 1" />
-    <color
-     name="ColorPaletteEntry05"
-     value="0 0.5 0 1" />
-    <color
-     name="ColorPaletteEntry06"
-     value="0 0.5 0.5 1" />
-    <color
-     name="ColorPaletteEntry07"
-     value="0 0 0.5 1" />
-    <color
-     name="ColorPaletteEntry08"
-     value="0.5 0 0.5 1" />
-    <color
-     name="ColorPaletteEntry09"
-     value="0.5 0.5 0 1" />
-    <color
-     name="ColorPaletteEntry10"
-     value="0 0.25 0.25 1" />
-    <color
-     name="ColorPaletteEntry11"
-     value="0 0.5 1 1" />
-    <color
-     name="ColorPaletteEntry12"
-     value="0 0.25 0.5 1" />
-    <color
-     name="ColorPaletteEntry13"
-     value="0.5 0 1 1" />
-    <color
-     name="ColorPaletteEntry14"
-     value="0.5 0.25 0 1" />
-    <color
-     name="ColorPaletteEntry15"
-     reference="White" />
-    <color
-     name="ColorPaletteEntry16"
-     reference="LtYellow" />
-    <color
-     name="ColorPaletteEntry17"
-     reference="White" />
-    <color
-     name="ColorPaletteEntry18"
-     reference="LtGray" />
-    <color
-     name="ColorPaletteEntry19"
-     reference="Red" />
-    <color
-     name="ColorPaletteEntry20"
-     reference="Yellow" />
-    <color
-     name="ColorPaletteEntry21"
-     reference="Green" />
-    <color
-     name="ColorPaletteEntry22"
-     value="0 1 1 1" />
-    <color
-     name="ColorPaletteEntry23"
-     reference="Blue" />
-    <color
-     name="ColorPaletteEntry24"
-     reference="Purple" />
-    <color
-     name="ColorPaletteEntry25"
-     value="1 1 0.5 1" />
-    <color
-     name="ColorPaletteEntry26"
-     value="0 1 0.5 1" />
-    <color
-     name="ColorPaletteEntry27"
-     value="0.5 1 1 1" />
-    <color
-     name="ColorPaletteEntry28"
-     value="0.5 0.5 1 1" />
-    <color
-     name="ColorPaletteEntry29"
-     value="1 0 0.5 1" />
-    <color
-     name="ColorPaletteEntry30"
-     value="1 0.5 0 1" />
-    <color
-     name="ColorPaletteEntry31"
-     reference="White" />
-    <color
-     name="ColorPaletteEntry32"
-     reference="White" />
-    <color
-     name="ComboListBgColor"
-     reference="DkGray" />
-    <color
-     name="ConsoleBackground"
-     reference="Black" />
-    <color
-     name="ContextSilhouetteColor"
-     reference="EmphasisColor" />
-    <color
-     name="DefaultHighlightDark"
-     reference="White_10" />
-    <color
-     name="DefaultHighlightLight"
-     reference="White_25" />
-    <color
-     name="DefaultShadowDark"
-     reference="Black_50" />
-    <color
-     name="DefaultShadowLight"
-     reference="Black_50" />
-    <color
-     name="EffectColor"
-     reference="White" />
-     <color
-     name="FilterBackgroundColor"
-     reference="Black" />
-    <color
-     name="FilterTextColor"
-     value="0.38 0.69 0.57 1" />
-     <color
-     name="FloaterButtonImageColor"
-     reference="LtGray" />
-    <color
-     name="FloaterDefaultBackgroundColor"
-     reference="DkGray_66" />
-    <color
-     name="FloaterFocusBackgroundColor"
-     reference="DkGray2" />
-    <color
-     name="FloaterFocusBorderColor"
-     reference="Black_50" />
-    <color
-     name="FloaterUnfocusBorderColor"
-     reference="Black_50" />
-    <color
-     name="FocusColor"
-     reference="EmphasisColor" />
-    <color
-     name="FolderViewLoadingMessageTextColor"
-     value="0.3344 0.5456 0.5159 1" />
-    <color
-     name="GridFocusPointColor"
-     reference="White_50" />
-    <color
-     name="GridlineBGColor"
-     value="0.92 0.92 1 0.78" />
-    <color
-     name="GridlineColor"
-     reference="White" />
-    <color
-     name="GridlineShadowColor"
-     value="0 0 0 0.31" />
-    <color
-     name="GroupNotifyBoxColor"
-     value="0.3344 0.5456 0.5159 1" />
-    <color
-     name="GroupNotifyTextColor"
-     reference="White"/>
-    <color
-     name="GroupNotifyDimmedTextColor"
-     reference="LtGray" />
-    <color
-     name="GroupOverTierColor"
-     value="0.43 0.06 0.06 1" />
-    <color
-     name="HTMLLinkColor"
-     reference="EmphasisColor" />
-    <color
-     name="HealthTextColor"
-     reference="White" />
-    <color
-     name="HelpBgColor"
-     reference="Unused?" />
-    <color
-     name="HelpFgColor"
-     reference="Unused?" />
-    <color
-     name="HelpScrollHighlightColor"
-     reference="Unused?" />
-    <color
-     name="HelpScrollShadowColor"
-     reference="Unused?" />
-    <color
-     name="HelpScrollThumbColor"
-     reference="Unused?" />
-    <color
-     name="HelpScrollTrackColor"
-     reference="Unused?" />
-    <color
-     name="HighlightChildColor"
-     reference="Yellow" />
-    <color
-     name="HighlightInspectColor"
-     value="1 0 1 1" />
-    <color
-     name="HighlightParentColor"
-     value="0.67 0.83 0.96 1" />
-    <color
-     name="IMHistoryBgColor"
-     reference="Unused?" />
-    <color
-     name="IMHistoryTextColor"
-     reference="Unused?" />
-    <color
-     name="IconDisabledColor"
-	 reference="White_25" />
-    <color
-     name="IconEnabledColor"
-     reference="White" />
-    <color
-     name="InventoryBackgroundColor"
-     reference="DkGray2" />
-    <color
-     name="InventoryFocusOutlineColor"
-     reference="White_25" />
-    <color
-     name="InventoryItemSuffixColor"
-     reference="White_25" />
-    <color
-     name="InventoryItemLibraryColor"
-     reference="EmphasisColor" />
-    <color
-     name="InventoryItemLinkColor"
-     reference="LtGray_50" />
-    <color
-     name="InventoryMouseOverColor"
-     reference="LtGray_35" />
-    <color
-     name="InventorySearchStatusColor"
-     reference="EmphasisColor" />
-    <color
-     name="LabelDisabledColor"
-     reference="White_25" />
-    <color
-     name="LabelSelectedColor"
-     reference="White" />
-    <color
-     name="LabelSelectedDisabledColor"
-     reference="White_25" />
-    <color
-     name="LabelTextColor"
-     reference="LtGray" />
-    <color
-     name="LoginProgressBarBgColor"
-     reference="Unused?" />
-    <color
-     name="LoginProgressBarFgColor"
-     reference="Unused?" />
-    <color
-     name="LoginProgressBoxBorderColor"
-     value="0 0.12 0.24 0" />
-    <color
-     name="LoginProgressBoxCenterColor"
-     value="0 0 0 0.78" />
-    <color
-     name="LoginProgressBoxShadowColor"
-     value="0 0 0 0.78" />
-    <color
-     name="LoginProgressBoxTextColor"
-     reference="White" />
-    <color
-     name="MapAvatarColor"
-     reference="Green" />
-    <color
-     name="MapAvatarFriendColor"
-     reference="Yellow" />
-    <color
-     name="MapAvatarSelfColor"
-     value="0.53125 0 0.498047 1" />
-    <color
-     name="MapFrustumColor"
-     reference="White_10" />
-    <color
-     name="MapFrustumRotatingColor"
-     value="1 1 1 0.2" />
-    <color
-     name="MapTrackColor"
-     reference="Red" />
-    <color
-     name="MapTrackDisabledColor"
-     value="0.5 0 0 1" />
-    <color
-     name="MenuBarBgColor"
-     reference="DkGray" />
-    <color
-     name="MenuBarGodBgColor"
-     reference="FrogGreen" />
-    <color
-     name="MenuDefaultBgColor"
-     reference="DkGray2" />
-    <color
-     name="MenuItemDisabledColor"
-	 reference="LtGray_50" />
-    <color
-     name="MenuItemEnabledColor"
-     reference="LtGray" />
-    <color
-     name="MenuItemHighlightBgColor"
-     reference="EmphasisColor_35" />
-    <color
-     name="MenuItemHighlightFgColor"
-     reference="White" />
-    <color
-     name="MenuNonProductionBgColor"
-     reference="Black" />
-    <color
-     name="MenuNonProductionGodBgColor"
-     value="0.263 0.325 0.345 1" />
-    <color
-     name="MenuPopupBgColor"
-	  reference="DkGray2" />
-    <color
-     name="ModelUploaderLabels"
-     value="1 0.6 0 1" />	  
-    <color
-     name="MultiSliderDisabledThumbColor"
-     reference="Black" />
-    <color
-     name="MultiSliderThumbCenterColor"
-     reference="White" />
-    <color
-     name="MultiSliderThumbCenterSelectedColor"
-     reference="Green" />
-    <color
-     name="MultiSliderThumbOutlineColor"
-     reference="Unused?" />
-    <color
-     name="MultiSliderTrackColor"
-     reference="LtGray" />
-    <color
-     name="MultiSliderTriangleColor"
-     reference="Yellow" />
+  <color
+      name="AccordionHeaderTextColor"
+      reference="LtGray" />
+  <color
+      name="AgentChatColor"
+      reference="White" />
+  <color
+      name="AlertBoxColor"
+      value="0.24 0.24 0.24 1" />
+  <color
+      name="AlertCautionBoxColor"
+      value="1 0.82 0.46 1" />
+  <color
+      name="AlertCautionTextColor"
+      reference="LtYellow" />
+  <color
+      name="AvatarListItemIconDefaultColor"
+      reference="White" />
+  <color
+      name="AvatarListItemIconOnlineColor"
+      reference="White" />
+  <color
+      name="AvatarListItemIconOfflineColor"
+      value="0.5 0.5 0.5 0.5" />
+  <color
+      name="AvatarListItemIconVoiceInvitedColor"
+      reference="AvatarListItemIconOfflineColor" />
+  <color
+      name="AvatarListItemIconVoiceJoinedColor"
+      reference="AvatarListItemIconOnlineColor" />
+  <color
+      name="AvatarListItemIconVoiceLeftColor"
+      reference="AvatarListItemIconOfflineColor" />
+  <color
+      name="BadgeImageColor"
+      value="1.0 0.40 0.0 1.0" />
+  <color
+      name="BadgeBorderColor"
+      value="0.9 0.9 0.9 1.0" />
+  <color
+      name="BadgeLabelColor"
+      reference="White" />
+  <color
+      name="ButtonBorderColor"
+      reference="Unused?" />
+  <color
+      name="ButtonCautionImageColor"
+      reference="Unused?" />
+  <color
+      name="ButtonColor"
+      reference="Unused?" />
+  <color
+      name="ButtonFlashBgColor"
+      reference="Unused?" />
+  <color
+      name="ButtonImageColor"
+      reference="White" />
+  <color
+      name="ButtonLabelColor"
+      reference="LtGray" />
+  <color
+      name="ButtonLabelDisabledColor"
+      reference="White_25" />
+  <color
+      name="ButtonLabelSelectedColor"
+      reference="White" />
+  <color
+      name="ButtonLabelSelectedDisabledColor"
+      reference="White_25" />
+  <color
+      name="ButtonSelectedBgColor"
+      reference="Unused?" />
+  <color
+      name="ButtonSelectedColor"
+      reference="Unused?" />
+  <color
+      name="ButtonUnselectedBgColor"
+      reference="Unused?" />
+  <color
+      name="ButtonUnselectedFgColor"
+      reference="Unused?" />
+  <color
+      name="ChatHistoryBgColor"
+      reference="Transparent" />
+  <color
+      name="ChatHistoryTextColor"
+      reference="LtGray" />
+  <color
+      name="ChicletFlashColor"
+      value="0.114 0.65 0.1" />
+  <color
+      name="ColorDropShadow"
+      reference="Black_50" />
+  <color
+      name="ColorPaletteEntry01"
+      reference="Black" />
+  <color
+      name="ColorPaletteEntry02"
+      reference="Gray" />
+  <color
+      name="ColorPaletteEntry03"
+      value="0.5 0 0 1" />
+  <color
+      name="ColorPaletteEntry04"
+      value="0.5 0.5 0 1" />
+  <color
+      name="ColorPaletteEntry05"
+      value="0 0.5 0 1" />
+  <color
+      name="ColorPaletteEntry06"
+      value="0 0.5 0.5 1" />
+  <color
+      name="ColorPaletteEntry07"
+      value="0 0 0.5 1" />
+  <color
+      name="ColorPaletteEntry08"
+      value="0.5 0 0.5 1" />
+  <color
+      name="ColorPaletteEntry09"
+      value="0.5 0.5 0 1" />
+  <color
+      name="ColorPaletteEntry10"
+      value="0 0.25 0.25 1" />
+  <color
+      name="ColorPaletteEntry11"
+      value="0 0.5 1 1" />
+  <color
+      name="ColorPaletteEntry12"
+      value="0 0.25 0.5 1" />
+  <color
+      name="ColorPaletteEntry13"
+      value="0.5 0 1 1" />
+  <color
+      name="ColorPaletteEntry14"
+      value="0.5 0.25 0 1" />
+  <color
+      name="ColorPaletteEntry15"
+      reference="White" />
+  <color
+      name="ColorPaletteEntry16"
+      reference="LtYellow" />
+  <color
+      name="ColorPaletteEntry17"
+      reference="White" />
+  <color
+      name="ColorPaletteEntry18"
+      reference="LtGray" />
+  <color
+      name="ColorPaletteEntry19"
+      reference="Red" />
+  <color
+      name="ColorPaletteEntry20"
+      reference="Yellow" />
+  <color
+      name="ColorPaletteEntry21"
+      reference="Green" />
+  <color
+      name="ColorPaletteEntry22"
+      value="0 1 1 1" />
+  <color
+      name="ColorPaletteEntry23"
+      reference="Blue" />
+  <color
+      name="ColorPaletteEntry24"
+      reference="Purple" />
+  <color
+      name="ColorPaletteEntry25"
+      value="1 1 0.5 1" />
+  <color
+      name="ColorPaletteEntry26"
+      value="0 1 0.5 1" />
+  <color
+      name="ColorPaletteEntry27"
+      value="0.5 1 1 1" />
+  <color
+      name="ColorPaletteEntry28"
+      value="0.5 0.5 1 1" />
+  <color
+      name="ColorPaletteEntry29"
+      value="1 0 0.5 1" />
+  <color
+      name="ColorPaletteEntry30"
+      value="1 0.5 0 1" />
+  <color
+      name="ColorPaletteEntry31"
+      reference="White" />
+  <color
+      name="ColorPaletteEntry32"
+      reference="White" />
+  <color
+      name="ComboListBgColor"
+      reference="DkGray" />
+  <color
+      name="ConsoleBackground"
+      reference="Black" />
+  <color
+      name="ContextSilhouetteColor"
+      reference="EmphasisColor" />
+  <color
+      name="DefaultHighlightDark"
+      reference="White_10" />
+  <color
+      name="DefaultHighlightLight"
+      reference="White_25" />
+  <color
+      name="DefaultShadowDark"
+      reference="Black_50" />
+  <color
+      name="DefaultShadowLight"
+      reference="Black_50" />
+  <color
+      name="EffectColor"
+      reference="White" />
+  <color
+      name="FilterBackgroundColor"
+      reference="Black" />
+  <color
+      name="FilterTextColor"
+      value="0.38 0.69 0.57 1" />
+  <color
+      name="FloaterButtonImageColor"
+      reference="LtGray" />
+  <color
+      name="FloaterDefaultBackgroundColor"
+      reference="DkGray_66" />
+  <color
+      name="FloaterFocusBackgroundColor"
+      reference="DkGray2" />
+  <color
+      name="FloaterFocusBorderColor"
+      reference="Black_50" />
+  <color
+      name="FloaterUnfocusBorderColor"
+      reference="Black_50" />
+  <color
+      name="FocusColor"
+      reference="EmphasisColor" />
+  <color
+      name="FolderViewLoadingMessageTextColor"
+      value="0.3344 0.5456 0.5159 1" />
+  <color
+      name="GridFocusPointColor"
+      reference="White_50" />
+  <color
+      name="GridlineBGColor"
+      value="0.92 0.92 1 0.78" />
+  <color
+      name="GridlineColor"
+      reference="White" />
+  <color
+      name="GridlineShadowColor"
+      value="0 0 0 0.31" />
+  <color
+      name="GroupNotifyBoxColor"
+      value="0.3344 0.5456 0.5159 1" />
+  <color
+      name="GroupNotifyTextColor"
+      reference="White"/>
+  <color
+      name="GroupNotifyDimmedTextColor"
+      reference="LtGray" />
+  <color
+      name="GroupOverTierColor"
+      value="0.43 0.06 0.06 1" />
+  <color
+      name="HTMLLinkColor"
+      reference="EmphasisColor" />
+  <color
+      name="HealthTextColor"
+      reference="White" />
+  <color
+      name="HelpBgColor"
+      reference="Unused?" />
+  <color
+      name="HelpFgColor"
+      reference="Unused?" />
+  <color
+      name="HelpScrollHighlightColor"
+      reference="Unused?" />
+  <color
+      name="HelpScrollShadowColor"
+      reference="Unused?" />
+  <color
+      name="HelpScrollThumbColor"
+      reference="Unused?" />
+  <color
+      name="HelpScrollTrackColor"
+      reference="Unused?" />
+  <color
+      name="HighlightChildColor"
+      reference="Yellow" />
+  <color
+      name="HighlightInspectColor"
+      value="1 0 1 1" />
+  <color
+      name="HighlightParentColor"
+      value="0.67 0.83 0.96 1" />
+  <color
+      name="IMHistoryBgColor"
+      reference="Unused?" />
+  <color
+      name="IMHistoryTextColor"
+      reference="Unused?" />
+  <color
+      name="IconDisabledColor"
+      reference="White_25" />
+  <color
+      name="IconEnabledColor"
+      reference="White" />
+  <color
+      name="InventoryBackgroundColor"
+      reference="DkGray2" />
+  <color
+      name="InventoryFocusOutlineColor"
+      reference="White_25" />
+  <color
+      name="InventoryItemSuffixColor"
+      reference="White_25" />
+  <color
+      name="InventoryItemLibraryColor"
+      reference="EmphasisColor" />
+  <color
+      name="InventoryItemLinkColor"
+      reference="LtGray_50" />
+  <color
+      name="InventoryMouseOverColor"
+      reference="LtGray_35" />
+  <color
+      name="InventorySearchStatusColor"
+      reference="EmphasisColor" />
+  <color
+      name="LabelDisabledColor"
+      reference="White_25" />
+  <color
+      name="LabelSelectedColor"
+      reference="White" />
+  <color
+      name="LabelSelectedDisabledColor"
+      reference="White_25" />
+  <color
+      name="LabelTextColor"
+      reference="LtGray" />
+  <color
+      name="LoginProgressBarBgColor"
+      reference="Unused?" />
+  <color
+      name="LoginProgressBarFgColor"
+      reference="Unused?" />
+  <color
+      name="LoginProgressBoxBorderColor"
+      value="0 0.12 0.24 0" />
+  <color
+      name="LoginProgressBoxCenterColor"
+      value="0 0 0 0.78" />
+  <color
+      name="LoginProgressBoxShadowColor"
+      value="0 0 0 0.78" />
+  <color
+      name="LoginProgressBoxTextColor"
+      reference="White" />
+  <color
+      name="MapAvatarColor"
+      reference="Green" />
+  <color
+      name="MapAvatarFriendColor"
+      reference="Yellow" />
+  <color
+      name="MapAvatarSelfColor"
+      value="0.53125 0 0.498047 1" />
+  <color
+      name="MapFrustumColor"
+      reference="White_10" />
+  <color
+      name="MapFrustumRotatingColor"
+      value="1 1 1 0.2" />
+  <color
+      name="MapTrackColor"
+      reference="Red" />
+  <color
+      name="MapTrackDisabledColor"
+      value="0.5 0 0 1" />
+  <color
+      name="MenuBarBgColor"
+      reference="DkGray" />
+  <color
+      name="MenuBarGodBgColor"
+      reference="FrogGreen" />
+  <color
+      name="MenuDefaultBgColor"
+      reference="DkGray2" />
+  <color
+      name="MenuItemDisabledColor"
+      reference="LtGray_50" />
+  <color
+      name="MenuItemEnabledColor"
+      reference="LtGray" />
+  <color
+      name="MenuItemHighlightBgColor"
+      reference="EmphasisColor_35" />
+  <color
+      name="MenuItemHighlightFgColor"
+      reference="White" />
+  <color
+      name="MenuNonProductionBgColor"
+      reference="Black" />
+  <color
+      name="MenuNonProductionGodBgColor"
+      value="0.263 0.325 0.345 1" />
+  <color
+      name="MenuPopupBgColor"
+      reference="DkGray2" />
+  <color
+      name="ModelUploaderLabels"
+      value="1 0.6 0 1" />	  
+  <color
+      name="MultiSliderDisabledThumbColor"
+      reference="Black" />
+  <color
+      name="MultiSliderThumbCenterColor"
+      reference="White" />
+  <color
+      name="MultiSliderThumbCenterSelectedColor"
+      reference="Green" />
+  <color
+      name="MultiSliderThumbOutlineColor"
+      reference="Unused?" />
+  <color
+      name="MultiSliderTrackColor"
+      reference="LtGray" />
+  <color
+      name="MultiSliderTriangleColor"
+      reference="Yellow" />
   <!--
-    <color
+      <color
       name="NameTagBackground"
       value="0.85 0.85 0.85 0.80" />
-      -->
-    <color
+  -->
+  <color
       name="NameTagBackground"
       value="0 0 0 1" />
-    <color
-     name="NameTagChat"
-     reference="White" />
-    <color
-     name="NameTagFriend"
-     value="0.447 0.784 0.663 1" />
-    <color
-     name="NameTagLegacy"
-     reference="White" />
-    <color
-     name="NameTagMatch"
-     reference="White" />
-    <color
-     name="NameTagMismatch"
-     reference="White" />
-    <color
-     name="NetMapBackgroundColor"
-     value="0 0 0 1" />
-    <color
-     name="NetMapGroupOwnAboveWater"
-     reference="Purple" />
-    <color
-     name="NetMapGroupOwnBelowWater"
-     value="0.78 0 0.78 1" />
-    <color
-     name="NetMapOtherOwnAboveWater"
-     value="0.24 0.24 0.24 1" />
-    <color
-     name="NetMapOtherOwnBelowWater"
-     value="0.12 0.12 0.12 1" />
-    <color
-     name="NetMapYouOwnAboveWater"
-     value="0 1 1 1" />
-    <color
-     name="NetMapYouOwnBelowWater"
-     value="0 0.78 0.78 1" />
-    <color
-     name="NotifyBoxColor"
-     value="LtGray" />
-    <color
-     name="NotifyCautionBoxColor"
-     value="1 0.82 0.46 1" />
-    <color
-     name="NotifyCautionWarnColor"
-     reference="White" />
-    <color
-     name="NotifyTextColor"
-     reference="White" />
-    <color
-     name="ObjectBubbleColor"
-     reference="DkGray_66" />
-    <color
-     name="ObjectChatColor"
-     reference="EmphasisColor" />
-    <color
-     name="OverdrivenColor"
-     reference="Red" />
-    <color
-     name="PanelDefaultBackgroundColor"
-     reference="DkGray" />
-    <color
-     name="PanelDefaultHighlightLight"
-     reference="White_50" />
-    <color
-     name="PanelFocusBackgroundColor"
-     reference="DkGray2" />
-    <color
-     name="PanelNotificationBackground"
-     value="1 0.3 0.3 0" />
-    <color
-     name="ParcelHoverColor"
-     reference="White" />
-    <color
-     name="PieMenuBgColor"
-     value="0.24 0.24 0.24 0.59" />
-    <color
-     name="PieMenuLineColor"
-     value="0 0 0 0.5" />
-    <color
-     name="PieMenuSelectedColor"
-     value="0.72 0.72 0.74 0.3" />
-    <color
-     name="PropertyColorAuction"
-     value="0.5 0 1 0.4" />
-    <color
-     name="PropertyColorAvail"
-     reference="Transparent" />
-    <color
-     name="PropertyColorForSale"
-     value="1 0.5 0 0.4" />
-    <color
-     name="PropertyColorGroup"
-     value="0 0.72 0.72 0.4" />
-    <color
-     name="PropertyColorOther"
-     value="1 0 0 0.4" />
-    <color
-     name="PropertyColorSelf"
-     value="0 1 0 0.4" />
-    <color
-     name="ScriptBgReadOnlyColor"
-     value="0.39 0.39 0.39 1" />
-    <color
-     name="ScriptErrorColor"
-     reference="Red" />
-    <color
-     name="ScrollBGStripeColor"
-     reference="Transparent" />
-    <color
-     name="ScrollBgReadOnlyColor"
+  <color
+      name="NameTagChat"
+      reference="White" />
+  <color
+      name="NameTagFriend"
+      value="0.447 0.784 0.663 1" />
+  <color
+      name="NameTagLegacy"
+      reference="White" />
+  <color
+      name="NameTagMatch"
+      reference="White" />
+  <color
+      name="NameTagMismatch"
+      reference="White" />
+  <color
+      name="NetMapBackgroundColor"
+      value="0 0 0 1" />
+  <color
+      name="NetMapGroupOwnAboveWater"
+      reference="Purple" />
+  <color
+      name="NetMapGroupOwnBelowWater"
+      value="0.78 0 0.78 1" />
+  <color
+      name="NetMapOtherOwnAboveWater"
+      value="0.24 0.24 0.24 1" />
+  <color
+      name="NetMapOtherOwnBelowWater"
+      value="0.12 0.12 0.12 1" />
+  <color
+      name="NetMapYouOwnAboveWater"
+      value="0 1 1 1" />
+  <color
+      name="NetMapYouOwnBelowWater"
+      value="0 0.78 0.78 1" />
+  <color
+      name="NotifyBoxColor"
+      value="LtGray" />
+  <color
+      name="NotifyCautionBoxColor"
+      value="1 0.82 0.46 1" />
+  <color
+      name="NotifyCautionWarnColor"
+      reference="White" />
+  <color
+      name="NotifyTextColor"
+      reference="White" />
+  <color
+      name="ObjectBubbleColor"
+      reference="DkGray_66" />
+  <color
+      name="ObjectChatColor"
+      reference="EmphasisColor" />
+  <color
+      name="OverdrivenColor"
+      reference="Red" />
+  <color
+      name="PanelDefaultBackgroundColor"
+      reference="DkGray" />
+  <color
+      name="PanelDefaultHighlightLight"
+      reference="White_50" />
+  <color
+      name="PanelFocusBackgroundColor"
+      reference="DkGray2" />
+  <color
+      name="PanelNotificationBackground"
+      value="1 0.3 0.3 0" />
+  <color
+      name="ParcelHoverColor"
+      reference="White" />
+  <color
+      name="PathfindingErrorColor"
+      reference="LtRed" />
+  <color
+      name="PathfindingWarningColor"
+      reference="DrYellow" />
+  <color
+      name="PathfindingGoodColor"
+      reference="LtGreen" />
+  <color
+      name="PieMenuBgColor"
+      value="0.24 0.24 0.24 0.59" />
+  <color
+      name="PieMenuLineColor"
+      value="0 0 0 0.5" />
+  <color
+      name="PieMenuSelectedColor"
+      value="0.72 0.72 0.74 0.3" />
+  <color
+      name="PropertyColorAuction"
+      value="0.5 0 1 0.4" />
+  <color
+      name="PropertyColorAvail"
+      reference="Transparent" />
+  <color
+      name="PropertyColorForSale"
+      value="1 0.5 0 0.4" />
+  <color
+      name="PropertyColorGroup"
+      value="0 0.72 0.72 0.4" />
+  <color
+      name="PropertyColorOther"
+      value="1 0 0 0.4" />
+  <color
+      name="PropertyColorSelf"
+      value="0 1 0 0.4" />
+  <color
+      name="ScriptBgReadOnlyColor"
+      value="0.39 0.39 0.39 1" />
+  <color
+      name="ScriptErrorColor"
+      reference="Red" />
+  <color
+      name="ScrollBGStripeColor"
       reference="Transparent" />
-    <color
-     name="ScrollBgWriteableColor"
-     reference="White_05" />
-    <color
-     name="ScrollDisabledColor"
-     reference="White_25" />
-    <color
-     name="ScrollHighlightedColor"
-     reference="Unused?" />
-    <color
-     name="ScrollHoveredColor"
-     reference="EmphasisColor_13" />
-    <color
-     name="ScrollSelectedBGColor"
-     reference="EmphasisColor_35" />
-    <color
-     name="ScrollSelectedFGColor"
-     reference="White" />
-    <color
-     name="ScrollUnselectedColor"
-     reference="LtGray" />
-    <color
-     name="ScrollbarThumbColor"
-     reference="White" />
-    <color
-     name="ScrollbarTrackColor"
-     reference="Black" />
-    <color
-     name="SelectedOutfitTextColor"
-     reference="EmphasisColor" />
-    <color
-     name="SilhouetteChildColor"
-     value="0.13 0.42 0.77 1" />
-    <color
-     name="SilhouetteParentColor"
-     reference="Yellow" />
-    <color
-     name="SliderDisabledThumbColor"
-     reference="White_25" />
-    <color
-     name="SliderThumbCenterColor"
-     reference="White" />
-    <color
-     name="SliderThumbOutlineColor"
-     reference="White" />
-    <color
-     name="SliderTrackColor"
-     reference="Unused?" />
-    <color
-     name="SpeakingColor"
-     reference="FrogGreen" />
-    <color
-     name="SystemChatColor"
-     reference="LtGray" />
-    <color
-     name="TextBgFocusColor"
-     reference="White" />
-    <color
-     name="TextBgReadOnlyColor"
-	 reference="White_05" />
-    <color
-     name="TextBgWriteableColor"
-     reference="LtGray" />
-    <color
-     name="TextCursorColor"
-     reference="Black" />
-    <color
-     name="TextDefaultColor"
-     reference="Black" />
-    <color
-     name="TextEmbeddedItemColor"
-     value="0 0 0.5 1" />
-    <color
-     name="TextEmbeddedItemReadOnlyColor"
-     reference="Unused?" />
-    <color
-     name="TextFgColor"
-     value="0.102 0.102 0.102 1" />
-    <color
-     name="TextFgReadOnlyColor"
-     reference="LtGray" />
-    <color
-     name="TextFgTentativeColor"
-     value="0.4 0.4 0.4 1" />
-    <color
-     name="TimeTextColor"
-     reference="LtGray" />
-    <color
-     name="TitleBarFocusColor"
-     reference="White_10" />
-    <color
-     name="ToastBackground"
-     value="0.3 0.3 0.3 0" />
-    <color
-     name="ToolTipBgColor"
-     value="0.937 0.89 0.655 1" />
-    <color
-     name="ToolTipBorderColor"
-     value="0.812 0.753 0.451 1" />
-    <color
-     name="ToolTipTextColor"
-     reference="DkGray2" />
-    <color
-     name="InspectorTipTextColor"
-     reference="LtGray" />
-    <color
-     name="UserChatColor"
-     reference="White" />
-    <color
-     name="llOwnerSayChatColor"
-     reference="LtYellow" />
+  <color
+      name="ScrollBgReadOnlyColor"
+      reference="Transparent" />
+  <color
+      name="ScrollBgWriteableColor"
+      reference="White_05" />
+  <color
+      name="ScrollDisabledColor"
+      reference="White_25" />
+  <color
+      name="ScrollHighlightedColor"
+      reference="Unused?" />
+  <color
+      name="ScrollHoveredColor"
+      reference="EmphasisColor_13" />
+  <color
+      name="ScrollSelectedBGColor"
+      reference="EmphasisColor_35" />
+  <color
+      name="ScrollSelectedFGColor"
+      reference="White" />
+  <color
+      name="ScrollUnselectedColor"
+      reference="LtGray" />
+  <color
+      name="ScrollbarThumbColor"
+      reference="White" />
+  <color
+      name="ScrollbarTrackColor"
+      reference="Black" />
+  <color
+      name="SelectedOutfitTextColor"
+      reference="EmphasisColor" />
+  <color
+      name="SilhouetteChildColor"
+      value="0.13 0.42 0.77 1" />
+  <color
+      name="SilhouetteParentColor"
+      reference="Yellow" />
+  <color
+      name="SliderDisabledThumbColor"
+      reference="White_25" />
+  <color
+      name="SliderThumbCenterColor"
+      reference="White" />
+  <color
+      name="SliderThumbOutlineColor"
+      reference="White" />
+  <color
+      name="SliderTrackColor"
+      reference="Unused?" />
+  <color
+      name="SpeakingColor"
+      reference="FrogGreen" />
+  <color
+      name="SystemChatColor"
+      reference="LtGray" />
+  <color
+      name="TextBgFocusColor"
+      reference="White" />
+  <color
+      name="TextBgReadOnlyColor"
+      reference="White_05" />
+  <color
+      name="TextBgWriteableColor"
+      reference="LtGray" />
+  <color
+      name="TextCursorColor"
+      reference="Black" />
+  <color
+      name="TextDefaultColor"
+      reference="Black" />
+  <color
+      name="TextEmbeddedItemColor"
+      value="0 0 0.5 1" />
+  <color
+      name="TextEmbeddedItemReadOnlyColor"
+      reference="Unused?" />
+  <color
+      name="TextFgColor"
+      value="0.102 0.102 0.102 1" />
+  <color
+      name="TextFgReadOnlyColor"
+      reference="LtGray" />
+  <color
+      name="TextFgTentativeColor"
+      value="0.4 0.4 0.4 1" />
+  <color
+      name="TimeTextColor"
+      reference="LtGray" />
+  <color
+      name="TitleBarFocusColor"
+      reference="White_10" />
+  <color
+      name="ToastBackground"
+      value="0.3 0.3 0.3 0" />
+  <color
+      name="ToolTipBgColor"
+      value="0.937 0.89 0.655 1" />
+  <color
+      name="ToolTipBorderColor"
+      value="0.812 0.753 0.451 1" />
+  <color
+      name="ToolTipTextColor"
+      reference="DkGray2" />
+  <color
+      name="InspectorTipTextColor"
+      reference="LtGray" />
+  <color
+      name="UserChatColor"
+      reference="White" />
+  <color
+      name="llOwnerSayChatColor"
+      reference="LtYellow" />
 
-    <!-- New Colors -->
-    <color
-     name="OutputMonitorMutedColor"
-     reference="DkGray2" />
-    <color
-     name="SysWellItemUnselected"
-     value="0 0 0 0" />
-    <color
-     name="SysWellItemSelected"
-     value="0.3 0.3 0.3 1.0" />
-    <color
-    name="ColorSwatchBorderColor"
-    value="0.45098 0.517647 0.607843 1"/>
-    <color
-     name="ChatTimestampColor"
-     reference="White" />
-    <color
-     name="MenuBarProjectBgColor"
-     reference="MdBlue" />
+  <!-- New Colors -->
+  <color
+      name="OutputMonitorMutedColor"
+      reference="DkGray2" />
+  <color
+      name="SysWellItemUnselected"
+      value="0 0 0 0" />
+  <color
+      name="SysWellItemSelected"
+      value="0.3 0.3 0.3 1.0" />
+  <color
+      name="ColorSwatchBorderColor"
+      value="0.45098 0.517647 0.607843 1"/>
+  <color
+      name="ChatTimestampColor"
+      reference="White" />
+  <color
+      name="MenuBarProjectBgColor"
+      reference="MdBlue" />
   
-    <color
+  <color
       name="MeshImportTableNormalColor"
       value="1 1 1 1"/>
-    <color
+  <color
       name="MeshImportTableHighlightColor"
       value="0.2 0.8 1 1"/>
 
-    <color
-     name="DirectChatColor"
-     reference="LtOrange" />
+  <color
+      name="DirectChatColor"
+      reference="LtOrange" />
 
-    <color
+  <color
       name="ToolbarDropZoneColor"
       value=".48 .69 1 .5" />
   
-    <!-- Generic color names (legacy) -->
+  <!-- Generic color names (legacy) -->
   <color
-    name="white"
-    value="1 1 1 1"/>
+      name="white"
+      value="1 1 1 1"/>
   <color
-    name="black"
-    value="0 0 0 1"/>
+      name="black"
+      value="0 0 0 1"/>
   <color
-    name="red"
-    value="1 0 0 1"/>
+      name="red"
+      value="1 0 0 1"/>
   <color
-    name="green"
-    value="0 1 0 1"/>
+      name="green"
+      value="0 1 0 1"/>
   <color
-    name="blue"
-    value="0 0 1 1"/>
+      name="blue"
+      value="0 0 1 1"/>
 </colors>
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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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.

---
 indra/newview/skins/default/colors.xml             | 21 +++++++++++++
 .../xui/en/floater_pathfinding_characters.xml      | 34 ++++++++++----------
 .../xui/en/floater_pathfinding_linksets.xml        | 36 +++++++++++-----------
 3 files changed, 57 insertions(+), 34 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index a39e1a0511..9bf2922033 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -104,6 +104,15 @@
   <color
       name="LtGreen"
       value="0.2 1 0.2 1" />
+  <color
+      name="Red_80"
+      value="1 0 0 0.8" />
+  <color
+      name="Green_80"
+      value="0 1 0 0.8" />
+  <color
+      name="Blue_80"
+      value="0 0 1 0.8" />
 
   <!-- This color name makes potentially unused colors show up bright purple.
        Leave this here until all Unused? are removed below, otherwise
@@ -635,6 +644,18 @@
   <color
       name="PathfindingGoodColor"
       reference="LtGreen" />
+  <color
+      name="PathfindingDefaultBeaconColor"
+      reference="Red_80" />
+  <color
+      name="PathfindingDefaultBeaconTextColor"
+      reference="White" />
+  <color
+      name="PathfindingLinksetBeaconColor"
+      reference="Blue_80" />
+  <color
+      name="PathfindingCharacterBeaconColor"
+      reference="Red_80" />
   <color
       name="PieMenuBgColor"
       value="0.24 0.24 0.24 0.59" />
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')

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')

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')

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')

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


From ff7223fafef58d9f8025e97fee87cf7911d93ccf Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 11 Jun 2012 14:45:59 -0700
Subject: PATH-706: Removing enforcement on frozen/unfrozen state from the
 linksets floater.  Also, removing handlers for agent state change.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index ad02beff7a..7b21f1f135 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -967,7 +967,7 @@
               function="Floater.ToggleOrBringToFront"
               parameter="pathfinding_linksets" />
           <menu_item_call.on_enable
-              function="Tools.EnablePathfindingLinksets" />
+              function="Tools.EnablePathfinding" />
         </menu_item_call>
         <menu_item_call
             label="Characters..."
-- 
cgit v1.2.3


From 2400b8a651e5aec599c2132d3cf9c12b78b21d83 Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Mon, 11 Jun 2012 17:46:39 -0400
Subject: WIP:path-703 Adding icon to slurl bar to indicate if dynamic
 pathfinding is enabled or disbled.

---
 .../skins/default/textures/icons/Pathfinding_Dynamic.png  | Bin 0 -> 683 bytes
 indra/newview/skins/default/textures/textures.xml         |   2 ++
 indra/newview/skins/default/xui/en/strings.xml            |   2 +-
 .../skins/default/xui/en/widgets/location_input.xml       |   9 +++++++++
 4 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png b/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png
new file mode 100644
index 0000000000..2c485aef0d
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index d5d58235a4..1b104bb766 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -433,6 +433,8 @@ with the same filename but different name
  <texture name="Parcel_Voice_Light" file_name="icons/Parcel_Voice_Light.png" preload="false" />
  <texture name="Parcel_VoiceNo_Light" file_name="icons/Parcel_VoiceNo_Light.png" preload="false" />
 
+  <texture name="Pathfinding_Dynamic" file_name="icons/Pathfinding_Dynamic.png" preload="false" />
+
   <texture name="Pause_Off" file_name="icons/Pause_Off.png" preload="false" />
   <texture name="Pause_Over" file_name="icons/Pause_Over.png" preload="false" />
   <texture name="Pause_Press" file_name="icons/Pause_Press.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 84532c4c2b..15963af960 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3325,7 +3325,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="LocationCtrlModerateIconTooltip">Moderate Region</string>
   <string name="LocationCtrlGeneralIconTooltip">General Region</string>
   <string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this parcel</string>
-
+  <string name="PathfindingDynamicTooltip">Dynamic Pathfinding Enabled</string>
   <!-- Strings used by the (currently Linux) auto-updater app -->
 	<string name="UpdaterWindowTitle">
 	  [APP_NAME] Update
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 44436fb6f2..a9cb5f83ed 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -112,6 +112,15 @@
     follows="right|top"
     image_name="Parcel_Health_Dark"
     />
+  <pathfinding_dynamic_icon
+    name="pathfinding_dynamic_icon"
+    width="14"
+    height="13"
+    top="19"
+    left="2"
+    follows="right|top"
+    image_name="Pathfinding_Dynamic"
+    />
   <!-- Default text color is invisible on top of nav bar background -->
   <damage_text
     name="damage_text"
-- 
cgit v1.2.3


From a087c4dfbb0823c66f21e3587de9d57937333e32 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 11 Jun 2012 15:00:33 -0700
Subject: PATH-710: Removing the pathfinding basic floater and supporting
 class.

---
 indra/newview/skins/default/textures/textures.xml  |  1 -
 .../default/xui/en/floater_pathfinding_basic.xml   | 79 ----------------------
 indra/newview/skins/default/xui/en/menu_viewer.xml |  9 ---
 indra/newview/skins/default/xui/en/strings.xml     |  2 -
 4 files changed, 91 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index d5d58235a4..e5778c3263 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -142,7 +142,6 @@ with the same filename but different name
   <texture name="Command_Outbox_Icon"       file_name="toolbar_icons/outbox.png"       preload="true" />
   <texture name="Command_Pathfinding_Icon"  file_name="toolbar_icons/land.png"         preload="true" />
   <texture name="Command_People_Icon"       file_name="toolbar_icons/people.png"       preload="true" />
-  <texture name="Command_PF_Basic_Icon"     file_name="toolbar_icons/land.png"         preload="true" />
   <texture name="Command_PF_Characters_Icon" file_name="toolbar_icons/land.png"        preload="true" />
   <texture name="Command_PF_Linksets_Icon"  file_name="toolbar_icons/land.png"         preload="true" />
   <texture name="Command_Picks_Icon"        file_name="toolbar_icons/picks.png"        preload="true" />
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml
deleted file mode 100644
index 7af40bbff6..0000000000
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
-    open_positioning="cascading"
-    can_tear_off="false"
-    height="213"
-    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">
-  <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="LabelTextColor"
-      length="1"
-      follows="left|top"
-      layout="topleft"
-      left="15"
-      name="status_label"
-      top="8"
-      width="289">
-  </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"
-      name="unfreeze_label"
-      top_pad="4"
-      width="289">
-    Allow 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"
-      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.
-  </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/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 7b21f1f135..2b1e814c69 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -942,15 +942,6 @@
          label="Pathfinding"
          name="Pathfinding"
          tear_off="false">
-        <menu_item_call
-            label="Basic setup..."
-            name="pathfinding_basic_menu_item">
-          <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..."
             name="pathfinding_console_menu_item">
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 84532c4c2b..f7e0206ab1 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3832,7 +3832,6 @@ 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>
@@ -3862,7 +3861,6 @@ 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 b912c27bf44a45e607adc3b5c94d3fd8a9bbf53e Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 11 Jun 2012 16:40:53 -0700
Subject: PATH-711: Implementing Leo's changes for the pathfinding console.

---
 .../default/xui/en/floater_pathfinding_console.xml | 91 +---------------------
 indra/newview/skins/default/xui/en/menu_viewer.xml | 18 ++---
 2 files changed, 11 insertions(+), 98 deletions(-)

(limited to 'indra/newview/skins')

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 54d44be015..a9815dcb00 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 edit / test"
+    title="Pathfinding debug"
     width="456">
   <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>
@@ -233,93 +233,6 @@
       top="14"
       height="268"
       width="218">
-    <panel
-        border="false"
-        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"
-          text_readonly_color="LabelDisabledColor"
-          length="1"
-          follows="left|top"
-          layout="topleft"
-          name="unfreeze_label"
-          left="16"
-          top_pad="16"
-          height="13"
-          width="190">
-        Allow object / terrain changes:
-      </text>
-      <button
-          follows="left|top"
-          height="22"
-          left="16"
-          enabled="false"
-          label="Unfreeze"
-          layout="topleft"
-          name="enter_unfrozen_mode"
-          top_pad="5"
-          width="116"/>
-      <text
-          word_wrap="true"
-          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">
-        Edit linkset attributes:
-      </text>
-      <button
-          follows="left|top"
-          height="22"
-          left="16"
-          label="Linksets..."
-          layout="topleft"
-          name="view_and_edit_linksets"
-          top_pad="5"
-          width="116"/>
-      <text
-          word_wrap="true"
-          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="32"
-          width="190">
-        Prevent object / terrain changes and update the navmesh:
-      </text>
-      <button
-          follows="left|top"
-          height="22"
-          left="16"
-          enabled="false"
-          label="Freeze"
-          layout="topleft"
-          name="enter_frozen_mode"
-          top_pad="3"
-          width="116"/>
-    </panel>
     <panel
         border="false"
         bevel_style="none"
@@ -327,7 +240,7 @@
         layout="topleft"
         left="1"
         name="test_panel"
-        label="Test">
+        label="Test path">
       <text
           height="14"
           word_wrap="true"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 2b1e814c69..ecc96ab402 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -942,15 +942,6 @@
          label="Pathfinding"
          name="Pathfinding"
          tear_off="false">
-        <menu_item_call
-            label="Edit / test..."
-            name="pathfinding_console_menu_item">
-          <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..."
             name="pathfinding_linksets_menu_item">
@@ -969,6 +960,15 @@
           <menu_item_call.on_enable
               function="Tools.EnablePathfinding" />
         </menu_item_call>
+        <menu_item_call
+            label="Pathfinding debug..."
+            name="pathfinding_console_menu_item">
+          <menu_item_call.on_click
+              function="Floater.ToggleOrBringToFront"
+              parameter="pathfinding_console" />
+          <menu_item_call.on_enable
+              function="Tools.EnablePathfindingDebug" />
+        </menu_item_call>
       </menu>
 
 
-- 
cgit v1.2.3


From e738e704b88d64b8a0183f94045d229d9f498bd1 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 11 Jun 2012 17:03:15 -0700
Subject: PATH-714: Removing the DEPRECATED_UNVERSIONED_NAVMESH as the viewer
 no longer has to support the Premium Wilderness regions on the old server
 code.

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

(limited to 'indra/newview/skins')

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 a9815dcb00..59b816b0e1 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -21,7 +21,6 @@
   <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>
-- 
cgit v1.2.3


From 916bd67532b407541e26b1e6053de65a2b291caa Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 11 Jun 2012 18:16:07 -0700
Subject: PATH-704: More clean-up of the old frozen/unfrozen state for objects
 and terrain.

---
 indra/newview/skins/default/xui/en/floater_tools.xml       |  4 ++--
 indra/newview/skins/default/xui/en/notifications.xml       | 12 ++----------
 indra/newview/skins/default/xui/en/sidepanel_task_info.xml |  4 ++--
 3 files changed, 6 insertions(+), 14 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 263e10aa1f..c881bb9d81 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -878,11 +878,11 @@
             </panel.string>
             <panel.string
              name="text modify info 5">
-                You can't modify this object in frozen mode
+                You can't modify this object across a region boundary
             </panel.string>
             <panel.string
              name="text modify info 6">
-                You can't modify these objects in frozen mode
+                You can't modify these objects across a region boundary
             </panel.string>
             <panel.string
              name="text modify warning">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 0526cf9991..af00d66ff9 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1291,14 +1291,6 @@ 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="AutomaticAgentStateUnfreeze"
@@ -1526,9 +1518,9 @@ Please make sure none are locked, and that you own all of them.
    icon="alertmodal.tga"
    name="CannotLinkPermanent"
    type="alertmodal">
-Unable to link permanent objects in frozen mode.
+Unable to link permanent objects.
 
-Please switch to unfrozen mode from the menu option Build->Pathfinding->Basic Setup.
+Please move all objects to the same region, and then attempt to link the objects together again.
     <tag>fail</tag>
   </notification>
 
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 8a823e8278..dbf44d8767 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -32,11 +32,11 @@
             </panel.string>
             <panel.string
              name="text modify info 5">
-                You can't modify this object in frozen mode
+                You can't modify this object across a region boundary
             </panel.string>
             <panel.string
              name="text modify info 6">
-                You can't modify these objects in frozen mode
+                You can't modify these objects across a region boundary
             </panel.string>
             <panel.string
              name="text modify warning">
-- 
cgit v1.2.3


From 42f3648814923edad8a040620cb3db233597cbb9 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 11 Jun 2012 18:59:51 -0700
Subject: PATH-705: First pass at removing the agent state functionality. WIP
 -- still need to remove XXX_STINSON_AGENT_STATE_DELETE_ME ifdef'ed code.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index af00d66ff9..62b2642b34 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1291,25 +1291,6 @@ 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"
-- 
cgit v1.2.3


From a45310e2af0abdcdb7a5d0ade1bd3c66af3dfae1 Mon Sep 17 00:00:00 2001
From: prep <none@none>
Date: Tue, 12 Jun 2012 11:23:31 -0400
Subject: Path-702: Added notification message and hooked up onparcelclick.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 62b2642b34..e9151c2db9 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5779,7 +5779,16 @@ This area has voice chat disabled. You won&apos;t be able to hear anyone talking
     <unique/>    
 This area has building disabled. You can&apos;t build or rez objects here.
   </notification>
-
+  
+  <notification
+     icon="notify.tga"
+     name="PathfindingDynamic"
+     persist="true"
+     type="notify">
+    <unique/>
+    Dynamic pathing is enabled.
+  </notification>
+  
   <notification
    icon="notify.tga"
    name="SeeAvatars"
-- 
cgit v1.2.3


From d500379cea865e4a6958eee82b5615ace61036c4 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 12 Jun 2012 21:58:52 -0400
Subject: PATH-735: Limit and clean up grid selection

---
 .../newview/skins/default/xui/en/notifications.xml |   9 +-
 indra/newview/skins/default/xui/en/panel_login.xml | 426 ++++++++++-----------
 2 files changed, 221 insertions(+), 214 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index afc5b916e7..590707fceb 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -898,7 +898,14 @@ You need an account to enter [SECOND_LIFE]. Would you like to create one now?
 You need to enter either the Username or both the First and Last name of your avatar into the Username field, then login again.
   </notification>
   
-
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidGrid"
+   type="alertmodal">
+   <tag>fail</tag>
+'[GRID]' is not a valid grid identifier.
+  </notification>
+  
   <notification
    icon="alertmodal.tga"
    name="DeleteClassified"
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 223326dd06..d227920d9c 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -1,216 +1,216 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-follows="all"
-height="600"
-layout="topleft"
-left="0"
-name="panel_login"
-focus_root="true" 
-top="600"
- width="996">
-<panel.string
-     name="create_account_url">
-       http://join.secondlife.com/
-</panel.string>
-<string name="reg_in_client_url" translate="false">
-     http://secondlife.eniac15.lindenlab.com/reg-in-client/
-</string>
-<panel.string
-     name="forgot_password_url">
-       http://secondlife.com/account/request.php
-</panel.string>
-<!-- *NOTE: Custom resize logic for login_html in llpanellogin.cpp -->
-<web_browser
-  tab_stop="false" 
-  trusted_content="true" 
-  bg_opaque_color="Black"
-  border_visible="false"
-  bottom="600"
-  follows="all"
-  left="0"
-  name="login_html"
-  start_url=""
-  top="0"
-  height="600"
-  width="980"/>
-<layout_stack
-follows="left|bottom|right"
-name="login_widgets"
-layout="topleft"
-orientation="horizontal"
-top="519"
-width="996"
-height="80">
-<layout_panel
-auto_resize="false"
-follows="left|bottom"
-name="login"
-layout="topleft"
-width="705"
-min_width="705"
-height="80">
-<text
-follows="left|bottom"
-font="SansSerifSmall"
-height="16"
-name="username_text"
-top="20"
-left="20"
-width="150">
-Username:
-</text>
-<combo_box
-allow_text_entry="true"
-follows="left|bottom"
-height="22"
-left_delta="0"
-max_chars="128"
-combo_editor.prevalidate_callback="ascii"
-tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
-top_pad="0"
-name="username_combo"
-width="178">
-  <combo_box.combo_button
-   visible ="false"/>
-  <combo_box.drop_down_button
-   visible ="false"/>
-</combo_box>
-<text
-follows="left|bottom"
-font="SansSerifSmall"
-height="15"
-left_pad="-19"
-name="password_text"
-top="20"
-    width="150">
-       Password:
-</text>
-<line_editor
-follows="left|bottom"
-  height="22"
-  max_length_bytes="16"
-name="password_edit"
-is_password="true" 
-select_on_focus="true"
-  top_pad="0"
-  width="135" />
- <check_box
-control_name="RememberPassword"
-follows="left|bottom"
-font="SansSerifSmall"
-height="16"
-label="Remember password"
-  top_pad="3"
-  name="remember_check"
- width="135" />
-<button
-  follows="left|bottom"
-  height="23"
-  image_unselected="PushButton_On"
-  image_selected="PushButton_On_Selected"
-  label="Log In"
-  label_color="White"
-  layout="topleft"
-  left_pad="10"
-  name="connect_btn"
-  top="35"
-  width="90" />
-  <text
-  follows="left|bottom"
-  font="SansSerifSmall"
-  height="15"
-  left_pad="8"
-  name="start_location_text"
-  top="20"
-  width="130">
-       Start at:
- </text>
-<combo_box
-allow_text_entry="true"
-control_name="NextLoginLocation"
-  follows="left|bottom"
-  height="23"
-max_chars="128"
-top_pad="0"
-name="start_location_combo"
-     width="165">
-<combo_box.item
-label="My last location"
-name="MyLastLocation"
-         value="last" />
-<combo_box.item
-label="My home"
-name="MyHome"
-         value="home" />
-<combo_box.item
-label="&lt;Type region name&gt;"
-name="Typeregionname"   value="" />
-</combo_box>
-<combo_box
-allow_text_entry="true"
-font="SansSerifSmall"
-   follows="left|right|bottom"
-   height="23"
-   max_chars="256"
-layout="topleft"
-top_pad="2"
-name="server_combo"
-width="135"
-  visible="false" />
-</layout_panel>
-<layout_panel
-tab_stop="false"
-follows="right|bottom"
-name="links"
-width="205"
-min_width="205"
-height="80">
-   <text
-follows="right|bottom"
-font="SansSerifSmall"
-text_color="EmphasisColor"
-halign="right"
-height="16"
-top="12"
-right="-10"
-name="create_new_account_text"
-  width="200">
-       Sign up
- </text>
-<text
-follows="right|bottom"
-font="SansSerifSmall"
-text_color="EmphasisColor"
-halign="right"
-height="16"
-name="forgot_password_text"
-top_pad="12"
-right="-10"
-  width="200">
-       Forgot your username or password?
-</text>
-<text
-follows="right|bottom"
-font="SansSerifSmall"
-text_color="EmphasisColor"
-halign="right"
-height="16"
-name="login_help"
-top_pad="2"
-right="-10"
-    width="200">
-       Need help logging in?   </text>
-<!--  <text
-    follows="right|bottom"
-    font="SansSerifSmall"
-    halign="right"
-    height="28"
-    top_pad="2"
-    name="channel_text"
-    width="180"
-    word_wrap="true">
-       [VERSION]
-   </text>-->
-   </layout_panel>
-</layout_stack>
+    follows="all"
+    height="600"
+    layout="topleft"
+    left="0"
+    name="panel_login"
+    focus_root="true" 
+    top="600"
+    width="996">
+  <panel.string
+      name="create_account_url">
+    http://join.secondlife.com/
+  </panel.string>
+  <string name="reg_in_client_url" translate="false">
+    http://secondlife.eniac15.lindenlab.com/reg-in-client/
+  </string>
+  <panel.string
+      name="forgot_password_url">
+    http://secondlife.com/account/request.php
+  </panel.string>
+  <!-- *NOTE: Custom resize logic for login_html in llpanellogin.cpp -->
+  <web_browser
+      tab_stop="false" 
+      trusted_content="true" 
+      bg_opaque_color="Black"
+      border_visible="false"
+      bottom="600"
+      follows="all"
+      left="0"
+      name="login_html"
+      start_url=""
+      top="0"
+      height="600"
+      width="980"/>
+  <layout_stack
+      follows="left|bottom|right"
+      name="login_widgets"
+      layout="topleft"
+      orientation="horizontal"
+      top="519"
+      width="996"
+      height="80">
+    <layout_panel
+        auto_resize="false"
+        follows="left|bottom"
+        name="login"
+        layout="topleft"
+        width="705"
+        min_width="705"
+        height="80">
+      <text
+          follows="left|bottom"
+          font="SansSerifSmall"
+          height="16"
+          name="username_text"
+          top="20"
+          left="20"
+          width="150">
+        Username:
+      </text>
+      <combo_box
+          allow_text_entry="true"
+          follows="left|bottom"
+          height="22"
+          left_delta="0"
+          max_chars="128"
+          combo_editor.prevalidate_callback="ascii"
+          tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
+          top_pad="0"
+          name="username_combo"
+          width="178">
+        <combo_box.combo_button
+            visible ="false"/>
+        <combo_box.drop_down_button
+            visible ="false"/>
+      </combo_box>
+      <text
+          follows="left|bottom"
+          font="SansSerifSmall"
+          height="15"
+          left_pad="-19"
+          name="password_text"
+          top="20"
+          width="150">
+        Password:
+      </text>
+      <line_editor
+          follows="left|bottom"
+          height="22"
+          max_length_bytes="16"
+          name="password_edit"
+          is_password="true" 
+          select_on_focus="true"
+          top_pad="0"
+          width="135" />
+      <check_box
+          control_name="RememberPassword"
+          follows="left|bottom"
+          font="SansSerifSmall"
+          height="16"
+          label="Remember password"
+          top_pad="3"
+          name="remember_check"
+          width="135" />
+      <button
+          follows="left|bottom"
+          height="23"
+          image_unselected="PushButton_On"
+          image_selected="PushButton_On_Selected"
+          label="Log In"
+          label_color="White"
+          layout="topleft"
+          left_pad="10"
+          name="connect_btn"
+          top="35"
+          width="90" />
+      <text
+          follows="left|bottom"
+          font="SansSerifSmall"
+          height="15"
+          left_pad="8"
+          name="start_location_text"
+          top="20"
+          width="130">
+        Start at:
+      </text>
+      <combo_box
+          allow_text_entry="true"
+          control_name="NextLoginLocation"
+          follows="left|bottom"
+          height="23"
+          max_chars="128"
+          top_pad="0"
+          name="start_location_combo"
+          width="165">
+        <combo_box.item
+            label="My last location"
+            name="MyLastLocation"
+            value="last" />
+        <combo_box.item
+            label="My home"
+            name="MyHome"
+            value="home" />
+        <combo_box.item
+            label="&lt;Type region name&gt;"
+            name="Typeregionname"   value="" />
+      </combo_box>
+      <combo_box
+          allow_text_entry="false"
+          font="SansSerifSmall"
+          follows="left|right|bottom"
+          height="23"
+          max_chars="256"
+          layout="topleft"
+          top_pad="2"
+          name="server_combo"
+          width="250"
+          visible="false" />
+    </layout_panel>
+    <layout_panel
+        tab_stop="false"
+        follows="right|bottom"
+        name="links"
+        width="205"
+        min_width="205"
+        height="80">
+      <text
+          follows="right|bottom"
+          font="SansSerifSmall"
+          text_color="EmphasisColor"
+          halign="right"
+          height="16"
+          top="12"
+          right="-10"
+          name="create_new_account_text"
+          width="200">
+        Sign up
+      </text>
+      <text
+          follows="right|bottom"
+          font="SansSerifSmall"
+          text_color="EmphasisColor"
+          halign="right"
+          height="16"
+          name="forgot_password_text"
+          top_pad="12"
+          right="-10"
+          width="200">
+        Forgot your username or password?
+      </text>
+      <text
+          follows="right|bottom"
+          font="SansSerifSmall"
+          text_color="EmphasisColor"
+          halign="right"
+          height="16"
+          name="login_help"
+          top_pad="2"
+          right="-10"
+          width="200">
+      Need help logging in?   </text>
+      <!--  <text
+           follows="right|bottom"
+           font="SansSerifSmall"
+           halign="right"
+           height="28"
+           top_pad="2"
+           name="channel_text"
+           width="180"
+           word_wrap="true">
+           [VERSION]
+           </text>-->
+    </layout_panel>
+  </layout_stack>
 </panel>
-- 
cgit v1.2.3


From de1e1db9600a03ab5b0dc3f04a5bdcee30632f05 Mon Sep 17 00:00:00 2001
From: prep <none@none>
Date: Wed, 13 Jun 2012 10:50:46 -0400
Subject: WIP for path-702.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index 58911bed56..107683f1f0 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -97,7 +97,7 @@
                visible="false"
                width="200"/>
       </layout_panel>
-      <layout_panel name="right_toolbar_panel"
+       <layout_panel name="right_toolbar_panel"
                     auto_resize="false"
                     height="500"
                     width="30"
-- 
cgit v1.2.3


From d7b9af3ab398aedde1229e081c2b245c20a3c6d5 Mon Sep 17 00:00:00 2001
From: prep <none@none>
Date: Wed, 13 Jun 2012 11:08:07 -0400
Subject: path-724: xml navmesh rebake button

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
new file mode 100644
index 0000000000..302b7afe49
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ height="25"
+ layout="topleft"
+ name="panel_navmesh_rebake"
+ mouse_opaque="false"
+ visible="true"
+ width="133">
+    <button
+     follows="left|bottom"
+     height="19"
+     label="NavMeshRebake"
+     layout="topleft"
+     left="10"
+     name="navmesh_btn"
+     tool_tip="Click here to rebake."
+     top="2"
+     visible="false"
+     width="113" />
+</panel>
+
-- 
cgit v1.2.3


From 9215c682d23d4b977f289c9700b24f3bf2d20b03 Mon Sep 17 00:00:00 2001
From: prep <prep@lindenlab.com>
Date: Wed, 13 Jun 2012 11:31:38 -0400
Subject: Added a baking button

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
index 302b7afe49..94ca00945b 100644
--- a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
+++ b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
@@ -9,7 +9,7 @@
     <button
      follows="left|bottom"
      height="19"
-     label="NavMeshRebake"
+     label="Rebake NavMesh"
      layout="topleft"
      left="10"
      name="navmesh_btn"
@@ -17,5 +17,16 @@
      top="2"
      visible="false"
      width="113" />
+  <button
+   follows="left|bottom"
+   height="19"
+   label="NavMesh Baking..."
+   layout="topleft"
+   left="10"
+   name="navmesh_btn_baking"
+   tool_tip="NavMesh is baking"
+   top="2"
+   visible="false"
+   width="113" />
 </panel>
 
-- 
cgit v1.2.3


From b0caa632cc479c6736efea995741e8334b9e766a Mon Sep 17 00:00:00 2001
From: "simon@Simon-PC.lindenlab.com" <simon@Simon-PC.lindenlab.com>
Date: Thu, 14 Jun 2012 15:10:19 -0700
Subject: MAINT-840 VWR-28604 DEV-2548:  [PUBLIC]Object by multiple creators
 shows creator as "(unknown)" in Inventory.   Now shows "(unknown /
 multiple)".  Reviewed by Kelly

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 54a312bd59..c5dfb703e5 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -11,6 +11,10 @@
 		 name="unknown">
         (unknown)
 	</panel.string>
+    <panel.string
+         name="unknown_multiple">
+        (unknown / multiple)
+    </panel.string>
 	<panel.string
 		 name="public">
         (public)
-- 
cgit v1.2.3


From 8a1c557cbffcc4608f0c3b2c69dedef69bb7f3f3 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 14 Jun 2012 17:09:14 -0700
Subject: Updating the slurl icon with Leo's design and toggling the behavior
 to show on PF disabled regions.

---
 .../default/textures/icons/Pathfinding_Dynamic.png      | Bin 683 -> 384 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png b/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png
index 2c485aef0d..0622141848 100644
Binary files a/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png and b/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png differ
-- 
cgit v1.2.3


From 3d0d6b8b184ddf2e0155abea95487508fcfafb4f Mon Sep 17 00:00:00 2001
From: prep <none@none>
Date: Fri, 15 Jun 2012 11:07:16 -0400
Subject: Updating notification and tooltip text to take into account the new
 toggling behavior.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e9151c2db9..ac36736a51 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5786,7 +5786,7 @@ This area has building disabled. You can&apos;t build or rez objects here.
      persist="true"
      type="notify">
     <unique/>
-    Dynamic pathing is enabled.
+    Dynamic pathing is not available.
   </notification>
   
   <notification
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index e6af4cf5a6..8771d83aa4 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3325,7 +3325,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="LocationCtrlModerateIconTooltip">Moderate Region</string>
   <string name="LocationCtrlGeneralIconTooltip">General Region</string>
   <string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this parcel</string>
-  <string name="PathfindingDynamicTooltip">Dynamic Pathfinding Enabled</string>
+  <string name="PathfindingDynamicTooltip">Dynamic Pathfinding is not available</string>
   <!-- Strings used by the (currently Linux) auto-updater app -->
 	<string name="UpdaterWindowTitle">
 	  [APP_NAME] Update
-- 
cgit v1.2.3


From 8b8f2fedbd733bad027f53cf2d6cc172c1d4b6d9 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 18 Jun 2012 17:55:27 -0700
Subject: Renaming the dynamic pathfinding icons to be better represent
 pathfinding disabled.

---
 .../skins/default/textures/icons/Pathfinding_Disabled.png | Bin 0 -> 384 bytes
 .../skins/default/textures/icons/Pathfinding_Dynamic.png  | Bin 384 -> 0 bytes
 indra/newview/skins/default/textures/textures.xml         |   2 +-
 indra/newview/skins/default/xui/en/notifications.xml      |   4 ++--
 indra/newview/skins/default/xui/en/strings.xml            |   2 +-
 .../skins/default/xui/en/widgets/location_input.xml       |   6 +++---
 6 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png
 delete mode 100644 indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png b/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png
new file mode 100644
index 0000000000..0622141848
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png differ
diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png b/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png
deleted file mode 100644
index 0622141848..0000000000
Binary files a/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png and /dev/null differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 0426fa9977..8bdec15f1f 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -432,7 +432,7 @@ with the same filename but different name
  <texture name="Parcel_Voice_Light" file_name="icons/Parcel_Voice_Light.png" preload="false" />
  <texture name="Parcel_VoiceNo_Light" file_name="icons/Parcel_VoiceNo_Light.png" preload="false" />
 
-  <texture name="Pathfinding_Dynamic" file_name="icons/Pathfinding_Dynamic.png" preload="false" />
+  <texture name="Pathfinding_Disabled" file_name="icons/Pathfinding_Disabled.png" preload="false" />
 
   <texture name="Pause_Off" file_name="icons/Pause_Off.png" preload="false" />
   <texture name="Pause_Over" file_name="icons/Pause_Over.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ac36736a51..c523add73e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5782,11 +5782,11 @@ This area has building disabled. You can&apos;t build or rez objects here.
   
   <notification
      icon="notify.tga"
-     name="PathfindingDynamic"
+     name="DynamicPathfindingDisabled"
      persist="true"
      type="notify">
     <unique/>
-    Dynamic pathing is not available.
+    Dynamic pathfinding is not enabled on this region.
   </notification>
   
   <notification
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 8771d83aa4..4f20b067f9 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3325,7 +3325,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="LocationCtrlModerateIconTooltip">Moderate Region</string>
   <string name="LocationCtrlGeneralIconTooltip">General Region</string>
   <string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this parcel</string>
-  <string name="PathfindingDynamicTooltip">Dynamic Pathfinding is not available</string>
+  <string name="LocationCtrlPathfindingDisabledTooltip">Dynamic pathfinding is not disabled on this region</string>
   <!-- Strings used by the (currently Linux) auto-updater app -->
 	<string name="UpdaterWindowTitle">
 	  [APP_NAME] Update
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index a9cb5f83ed..01dc0f200b 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -112,14 +112,14 @@
     follows="right|top"
     image_name="Parcel_Health_Dark"
     />
-  <pathfinding_dynamic_icon
-    name="pathfinding_dynamic_icon"
+  <pathfinding_disabled_icon
+    name="pathfinding_disabled_icon"
     width="14"
     height="13"
     top="19"
     left="2"
     follows="right|top"
-    image_name="Pathfinding_Dynamic"
+    image_name="Pathfinding_Disabled"
     />
   <!-- Default text color is invisible on top of nav bar background -->
   <damage_text
-- 
cgit v1.2.3


From b20f1a51430f1d611c129e170bf69bc52b9d0700 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 18 Jun 2012 19:07:37 -0700
Subject: PATH-750: Adding icon to display pathfinding dirty state.

---
 .../skins/default/textures/icons/Pathfinding_Dirty.png    | Bin 0 -> 553 bytes
 indra/newview/skins/default/textures/textures.xml         |   1 +
 indra/newview/skins/default/xui/en/notifications.xml      |  11 ++++++++++-
 indra/newview/skins/default/xui/en/strings.xml            |   3 ++-
 .../skins/default/xui/en/widgets/location_input.xml       |   9 +++++++++
 5 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Pathfinding_Dirty.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Dirty.png b/indra/newview/skins/default/textures/icons/Pathfinding_Dirty.png
new file mode 100644
index 0000000000..cfa12cb7cc
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/Pathfinding_Dirty.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 8bdec15f1f..b76f04d17f 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -432,6 +432,7 @@ with the same filename but different name
  <texture name="Parcel_Voice_Light" file_name="icons/Parcel_Voice_Light.png" preload="false" />
  <texture name="Parcel_VoiceNo_Light" file_name="icons/Parcel_VoiceNo_Light.png" preload="false" />
 
+  <texture name="Pathfinding_Dirty" file_name="icons/Pathfinding_Dirty.png" preload="false" />
   <texture name="Pathfinding_Disabled" file_name="icons/Pathfinding_Disabled.png" preload="false" />
 
   <texture name="Pause_Off" file_name="icons/Pause_Off.png" preload="false" />
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c523add73e..39c6939201 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5779,7 +5779,16 @@ This area has voice chat disabled. You won&apos;t be able to hear anyone talking
     <unique/>    
 This area has building disabled. You can&apos;t build or rez objects here.
   </notification>
-  
+
+  <notification
+     icon="notify.tga"
+     name="PathfindingDirty"
+     persist="true"
+     type="notify">
+    <unique/>
+    The pathfinding navmesh is not up-to-date on the current region.  If you have build rights, you may rebake the navmesh by clicking on the Rebake Region button.
+  </notification>
+
   <notification
      icon="notify.tga"
      name="DynamicPathfindingDisabled"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4f20b067f9..4fdbe557b9 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3325,7 +3325,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="LocationCtrlModerateIconTooltip">Moderate Region</string>
   <string name="LocationCtrlGeneralIconTooltip">General Region</string>
   <string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this parcel</string>
-  <string name="LocationCtrlPathfindingDisabledTooltip">Dynamic pathfinding is not disabled on this region</string>
+  <string name="LocationCtrlPathfindingDirtyTooltip">The pathfinding navmesh is not up-to-date.</string>
+  <string name="LocationCtrlPathfindingDisabledTooltip">Dynamic pathfinding is not disabled on this region.</string>
   <!-- Strings used by the (currently Linux) auto-updater app -->
 	<string name="UpdaterWindowTitle">
 	  [APP_NAME] Update
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 01dc0f200b..0eec895b04 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -112,6 +112,15 @@
     follows="right|top"
     image_name="Parcel_Health_Dark"
     />
+  <pathfinding_dirty_icon
+    name="pathfinding_dirty_icon"
+    width="14"
+    height="13"
+    top="19"
+    left="2"
+    follows="right|top"
+    image_name="Pathfinding_Dirty"
+    />
   <pathfinding_disabled_icon
     name="pathfinding_disabled_icon"
     width="14"
-- 
cgit v1.2.3


From e4aa2038812c2cf2cfed1b17a437ba620929f84f Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 19 Jun 2012 17:20:24 -0700
Subject: PATH-702: Positioning the rebake navmesh button to align with the
 Stand/StopFlying buttons.  Also, parenting the buttons to the toolbar UI
 elements.

---
 indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml | 6 +++---
 indra/newview/skins/default/xui/en/panel_toolbar_view.xml   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
index 94ca00945b..35d07eea99 100644
--- a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
+++ b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
@@ -9,7 +9,7 @@
     <button
      follows="left|bottom"
      height="19"
-     label="Rebake NavMesh"
+     label="Rebake navmesh"
      layout="topleft"
      left="10"
      name="navmesh_btn"
@@ -20,11 +20,11 @@
   <button
    follows="left|bottom"
    height="19"
-   label="NavMesh Baking..."
+   label="Navmesh baking..."
    layout="topleft"
    left="10"
    name="navmesh_btn_baking"
-   tool_tip="NavMesh is baking"
+   tool_tip="Navmesh is baking."
    top="2"
    visible="false"
    width="113" />
diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index 107683f1f0..f5c559fe1d 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -93,7 +93,7 @@
                left="0"
                mouse_opaque="false"
                tab_stop="false"
-               name="stand_stop_flying_container"
+               name="state_management_buttons_container"
                visible="false"
                width="200"/>
       </layout_panel>
-- 
cgit v1.2.3


From b98cbe00fe885cebebe1ec5fd123c969b5d2c29f Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 19 Jun 2012 19:06:25 -0700
Subject: PATH-702: Refining the behavior of the rebuild navmesh button after
 it is pushed, and removing unused code.

---
 .../skins/default/xui/en/panel_navmesh_rebake.xml  | 56 +++++++++++-----------
 1 file changed, 29 insertions(+), 27 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
index 35d07eea99..c7bf91efb4 100644
--- a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
+++ b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
@@ -1,32 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
- height="25"
- layout="topleft"
- name="panel_navmesh_rebake"
- mouse_opaque="false"
- visible="true"
- width="133">
-    <button
-     follows="left|bottom"
-     height="19"
-     label="Rebake navmesh"
-     layout="topleft"
-     left="10"
-     name="navmesh_btn"
-     tool_tip="Click here to rebake."
-     top="2"
-     visible="false"
-     width="113" />
+    height="25"
+    layout="topleft"
+    name="panel_navmesh_rebake"
+    mouse_opaque="false"
+    visible="true"
+    width="133">
   <button
-   follows="left|bottom"
-   height="19"
-   label="Navmesh baking..."
-   layout="topleft"
-   left="10"
-   name="navmesh_btn_baking"
-   tool_tip="Navmesh is baking."
-   top="2"
-   visible="false"
-   width="113" />
+      follows="left|bottom"
+      height="19"
+      label="Clean up region"
+      layout="topleft"
+      left="10"
+      name="navmesh_btn"
+      tool_tip="Click here to rebake the region&apos;s navmesh."
+      top="2"
+      visible="false"
+      enabled="true"
+      width="113" />
+  <button
+      follows="left|bottom"
+      height="19"
+      label="Region is cleaning"
+      layout="topleft"
+      left="10"
+      name="navmesh_btn_baking"
+      tool_tip="Region is cleaning up."
+      top="2"
+      visible="false"
+      enabled="false"
+      width="113" />
 </panel>
 
-- 
cgit v1.2.3


From f87034c3c2b9e11dee678dc3ff3458d2485c1710 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 20 Jun 2012 18:07:04 -0700
Subject: PATH-760: First pass at Leo's new design for the build floater.

---
 .../newview/skins/default/xui/en/floater_tools.xml | 113 ++++++++++++---------
 indra/newview/skins/default/xui/en/strings.xml     |   6 +-
 2 files changed, 69 insertions(+), 50 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index c881bb9d81..c49ce90e6b 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -980,7 +980,7 @@
              height="19"
              layout="topleft"
              name="Owner:"
-             top_pad="13"
+             top_pad="3"
              width="90">
                 Owner:
             </text>
@@ -1008,7 +1008,7 @@
              left="10"
              height="18"
              name="Group:"
-             top_pad="17"
+             top_pad="3"
              width="75">
                 Group:
             </text>
@@ -1037,7 +1037,7 @@
              layout="topleft"
              name="checkbox share with group"
              tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
-             top_pad="10"
+             top_pad="5"
              left="100"
              width="87" />
             <button
@@ -1059,7 +1059,7 @@
              top_pad="10"
              left="10"
              name="label click action"
-             width="118">
+             width="82">
                 Click to:
             </text>
             <combo_box
@@ -1067,7 +1067,7 @@
              height="23"
              layout="topleft"
              name="clickaction"
-             width="148"
+             width="130"
              left_pad="10">
                 <combo_box.item
                  label="Touch  (default)"
@@ -1100,19 +1100,39 @@
              layout="topleft"
              name="checkbox for sale"
              left="7"
-             width="100" />
-<!-- NEW SALE TYPE COMBO BOX -->
+             width="97" />
+  <!-- NEW PRICE SPINNER
+Objects are allowed to be for sale for L$0 to invoke buy UI behavior
+even though the user gets a free copy.
+-->
+  <spinner
+      follows="left|top"
+      decimal_digits="0"
+      increment="1"
+      left_pad="0"
+      control_name="Edit Cost"
+      name="Edit Cost"
+      label="L$"
+      label_width="15"
+      label_text.valign="center"
+      valign="center"
+      width="85"
+      min_val="0"
+      height="20"
+      max_val="999999999" />
+  <!-- NEW SALE TYPE COMBO BOX -->
       <combo_box
-            left_pad="10"
+            left_pad="8"
             layout="topleft"
             follows="left|top"
             allow_text_entry="false"
             height="23"
+            top_pad="-23"
             initial_value="2"
             max_chars="20"
             mouse_opaque="true"
             name="sale type"
-            width="168">
+            width="89">
         <combo_box.item
            name="Copy"
            label="Copy"
@@ -1126,31 +1146,13 @@
            label="Original"
            value="1" />
       </combo_box>
-<!-- NEW PRICE SPINNER
-Objects are allowed to be for sale for L$0 to invoke buy UI behavior
-even though the user gets a free copy.
--->
-    <spinner
-        follows="left|top"
-        decimal_digits="0"
-        increment="1"
-        top_pad="8"
-        left="118"
-        control_name="Edit Cost"
-        name="Edit Cost"
-        label="Price: L$"
-        label_width="65"
-        width="165"
-        min_val="0"
-        height="20"
-        max_val="999999999" />
       <check_box
 	   height="15"
 	   width="110"
 	   top_pad="5"
 	   label="Show in search"
        layout="topleft"
-	   left="100"
+	   left="7"
        name="search_check"
        tool_tip="Let people see this object in search results" />
 		<panel
@@ -1163,15 +1165,16 @@ even though the user gets a free copy.
          name="perms_build"
          left="0"
          top_pad="4"
-         height="105"
+         height="121"
          width="290">
             <text
              type="string"
              length="1"
              left="10"
+             word_wrap="true"
              top_pad="9"
              text_color="EmphasisColor"
-             height="16"
+             height="32"
              follows="left|top|right"
              layout="topleft"
              name="perm_modify"
@@ -1241,7 +1244,7 @@ even though the user gets a free copy.
              type="string"
              text_color="EmphasisColor"
              length="1"
-             top="9"
+             top="23"
              follows="left|top"
              layout="topleft"
              left="230"
@@ -1316,7 +1319,36 @@ even though the user gets a free copy.
                 F:
             </text>
         </panel>
-      </panel>
+		<panel
+         border="false"
+         follows="left|top"
+         layout="topleft"
+         mouse_opaque="false"
+         name="pathfinding_attrs_panel"
+         left="0"
+         top_pad="0"
+         height="25"
+         width="290">
+      <text
+         type="string"
+         follows="left|top"
+         name="pathfinding_attributes_label"
+         top_pad="4"
+         width="150"
+         left="10">
+        Pathfinding attributes:
+      </text>
+      <text
+         type="string"
+         follows="left|top"
+         text_color="EmphasisColor"
+         name="pathfinding_attributes_value"
+         width="130"
+         word_wrap="false"
+         left_pad="0">
+      </text>
+    </panel>
+  </panel>
       <!-- Object tab -->
       <panel
          border="false"
@@ -1363,23 +1395,6 @@ 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" />
-        <check_box
-         height="19"
-         enabled="false"
-         label="Character"
-         layout="topleft"
-         name="Character Checkbox Ctrl"
-         top_pad="0"
-         width="123" />
-
         <text
              type="string"
              length="1"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4fdbe557b9..3c79fdfb73 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3890,7 +3890,11 @@ Try enclosing path to the editor with double quotes.
 
   <!-- Pathfinding -->
   <string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
-  
+  <string name="Pathfinding_Object_Attr_None">&lt;none&gt;</string>
+  <string name="Pathfinding_Object_Attr_Permanent">Permanent</string>
+  <string name="Pathfinding_Object_Attr_Character">Character</string>
+  <string name="Pathfinding_Object_Attr_MultiSelect">&lt;multiple&gt;</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 fb1fa8434a1a84105f67e72fdf72d300be2951bb Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 20 Jun 2012 19:46:28 -0700
Subject: PATH-761: Implementing the new design for the pathfinding view
 floater.

---
 .../default/xui/en/floater_pathfinding_console.xml | 390 +++++++++------------
 indra/newview/skins/default/xui/en/menu_viewer.xml |   4 +-
 2 files changed, 173 insertions(+), 221 deletions(-)

(limited to 'indra/newview/skins')

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 59b816b0e1..3bcbbf342c 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="446"
+    height="498"
     layout="topleft"
     name="floater_pathfinding_console"
     help_topic="floater_pathfinding_console"
     reuse_instance="true"
     save_rect="true"
     single_instance="true"
-    title="Pathfinding debug"
-    width="456">
+    title="Pathfinding view"
+    width="240">
   <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>
@@ -41,10 +41,10 @@
       bevel_style="none"
       follows="left|top"
       layout="topleft"
-      left="14"
-      top_pad="15"
-      height="68"
-      width="200">
+      left="12"
+      top_pad="10"
+      height="61"
+      width="214">
     <text
         height="13"
         word_wrap="true"
@@ -55,7 +55,7 @@
         layout="topleft"
         left="0"
         top_pad="0"
-        width="200">
+        width="214">
       Viewer status
     </text>
     <text
@@ -70,174 +70,201 @@
         left="0"
         name="pathfinding_viewer_status"
         top_pad="8"
-        width="200">
+        width="214">
     </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="297"
-      width="200">
+      left="12"
+      height="66"
+      width="214">
     <text
         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
-        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"
-        width="90" />
+        top_pad="5"
+        width="214">
+      Simulator status
+    </text>
     <text
-        height="13"
+        height="40"
         word_wrap="true"
         use_ellipses="false"
         type="string"
-        text_color="LabelTextColor"
-        text_readonly_color="LabelDisabledColor"
-        name="show_walkability_label"
+        text_color="PathfindingGoodColor"
         length="1"
         follows="left|top"
         layout="topleft"
-        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"
-        width="90" />
-    <check_box
-        height="19"
-        label="Material volumes"
-        layout="topleft"
-        name="show_material_volumes"
-        top_pad="4"
-        width="90" />
-    <check_box
-        height="19"
-        label="Static obstacles"
-        layout="topleft"
-        name="show_static_obstacles"
-        top_pad="4"
-        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="Water plane"
-        layout="topleft"
-        name="show_water_plane"
-        top_pad="4"
-        width="90" />
-    <check_box
-        height="19"
-        label="With X-ray vision"
-        layout="topleft"
-        name="show_xray"
-        top_pad="4"
-        width="90" />
+        name="pathfinding_simulator_status"
+        top_pad="8"
+        width="214">
+    </text>
   </panel>
   <view_border
       bevel_style="none"
       follows="top|left"
       layout="topleft"
-      left="230"
-      top="35"
-      height="247"
-      width="214"
+      left="12"
+      top="179"
+      height="305"
+      width="213"
       visible="true" />
   <tab_container
       follows="left|top"
       layout="topleft"
       tab_position="top"
-      name="edit_test_tab_container"
-      left="227"
-      top="14"
-      height="268"
-      width="218">
+      name="view_test_tab_container"
+      left="12"
+      top="157"
+      height="328"
+      width="214">
+    <panel
+        border="false"
+        bevel_style="none"
+        follows="left|top"
+        layout="topleft"
+        name="view_panel"
+        label="View">
+      <text
+          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="20"
+          left="12"
+          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="32"
+          name="show_world_movables_only"
+          top_pad="4"
+          width="90" />
+      <check_box
+          height="19"
+          label="Navmesh"
+          left="12"
+          layout="topleft"
+          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"
+          name="show_walkability_label"
+          length="1"
+          follows="left|top"
+          layout="topleft"
+          left="32"
+          width="180">
+        Show walkability map:
+      </text>
+      <combo_box
+          height="19"
+          layout="topleft"
+          left="32"
+          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="12"
+          name="show_walkables"
+          top_pad="10"
+          width="90" />
+      <check_box
+          height="19"
+          label="Material volumes"
+          layout="topleft"
+          name="show_material_volumes"
+          top_pad="4"
+          width="90" />
+      <check_box
+          height="19"
+          label="Static obstacles"
+          layout="topleft"
+          name="show_static_obstacles"
+          top_pad="4"
+          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="Water plane"
+          layout="topleft"
+          name="show_water_plane"
+          top_pad="4"
+          width="90" />
+      <check_box
+          height="19"
+          label="With X-ray vision"
+          layout="topleft"
+          name="show_xray"
+          top_pad="4"
+          width="90" />
+    </panel>
     <panel
         border="false"
         bevel_style="none"
         follows="left|top"
         layout="topleft"
-        left="1"
         name="test_panel"
         label="Test path">
       <text
@@ -249,11 +276,11 @@
           text_readonly_color="LabelDisabledColor"
           name="ctrl_click_label"
           length="1"
-          left="16"
+          left="12"
           follows="left|top"
           layout="topleft"
-          top_pad="12"
-          width="190">
+          top_pad="20"
+          width="202">
         Ctrl-click to select start point.
       </text>
       <text
@@ -268,7 +295,7 @@
           follows="left|top"
           layout="topleft"
           top_pad="5"
-          width="190">
+          width="202">
         Shift-click to select end point.
       </text>
       <view_border
@@ -291,7 +318,7 @@
           follows="left|top"
           layout="topleft"
           top_pad="14"
-          width="190">
+          width="202">
         Character width
       </text>
       <slider
@@ -335,7 +362,7 @@
           layout="topleft"
           left_pad="-165"
           top_pad="13"
-          width="190">
+          width="202">
         Character type
       </text>
       <combo_box
@@ -377,7 +404,7 @@
           layout="topleft"
           name="path_test_status"
           top_pad="11"
-          width="190">
+          width="202">
       </text>
       <button
           follows="left|top"
@@ -389,79 +416,4 @@
           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="25"
-      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>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index ecc96ab402..32ba7a5342 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -961,13 +961,13 @@
               function="Tools.EnablePathfinding" />
         </menu_item_call>
         <menu_item_call
-            label="Pathfinding debug..."
+            label="View..."
             name="pathfinding_console_menu_item">
           <menu_item_call.on_click
               function="Floater.ToggleOrBringToFront"
               parameter="pathfinding_console" />
           <menu_item_call.on_enable
-              function="Tools.EnablePathfindingDebug" />
+              function="Tools.EnablePathfinding" />
         </menu_item_call>
       </menu>
 
-- 
cgit v1.2.3


From f86e2891be5a4e55f0ffae685915a92d8514e59a Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 21 Jun 2012 17:05:04 -0700
Subject: PATH-761: Updating the name of the pathfinding console.

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

(limited to 'indra/newview/skins')

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 3bcbbf342c..63e626b43b 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 view"
+    title="Pathfinding view / test"
     width="240">
   <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>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 32ba7a5342..7e6709f0d6 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -961,7 +961,7 @@
               function="Tools.EnablePathfinding" />
         </menu_item_call>
         <menu_item_call
-            label="View..."
+            label="View / test..."
             name="pathfinding_console_menu_item">
           <menu_item_call.on_click
               function="Floater.ToggleOrBringToFront"
-- 
cgit v1.2.3


From f143da27bf09b0e7a9b73de80609b2326a7e672e Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 21 Jun 2012 18:03:23 -0700
Subject: PATH-760: Ensuring that the pathfinding attribute field works
 correctly with multiple objects selected.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3c79fdfb73..b0b4de3a0f 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3890,10 +3890,10 @@ Try enclosing path to the editor with double quotes.
 
   <!-- Pathfinding -->
   <string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
-  <string name="Pathfinding_Object_Attr_None">&lt;none&gt;</string>
+  <string name="Pathfinding_Object_Attr_None">None</string>
   <string name="Pathfinding_Object_Attr_Permanent">Permanent</string>
   <string name="Pathfinding_Object_Attr_Character">Character</string>
-  <string name="Pathfinding_Object_Attr_MultiSelect">&lt;multiple&gt;</string>
+  <string name="Pathfinding_Object_Attr_MultiSelect">(Multiple)</string>
 
   <!-- Snapshot image quality levels -->
   <string name="snapshot_quality_very_low">Very Low</string>
-- 
cgit v1.2.3


From 328322436c046bf229de83041b29ebe5ce7c4029 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 22 Jun 2012 16:12:32 -0700
Subject: PATH-764,PATH-765: Adding in a context menu option on right-click of
 an object to show in the linksets floater if all objects are non-characters,
 or to show in the characters floater if all objects are characters.

---
 indra/newview/skins/default/xui/en/menu_object.xml | 334 +++++++++++----------
 1 file changed, 177 insertions(+), 157 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 719509301b..52b9524b11 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -1,179 +1,199 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <context_menu
- layout="topleft"
- name="Object Pie">
-   <menu_item_call
-     enabled="false"
-     label="Touch"
-     name="Object Touch">
-        <menu_item_call.on_click
-         function="Object.Touch" />
-        <menu_item_call.on_enable
-         function="Object.EnableTouch"
-         name="EnableTouch"
-         parameter="Touch" />
-   </menu_item_call>
-   <menu_item_call
-     label="Edit"
-     name="Edit...">
-        <menu_item_call.on_click
-         function="Object.Edit" />
+    layout="topleft"
+    name="Object Pie">
+  <menu_item_call
+      enabled="false"
+      label="Touch"
+      name="Object Touch">
+    <menu_item_call.on_click
+        function="Object.Touch" />
     <menu_item_call.on_enable
-         function="EnableEdit"/>
-    </menu_item_call>
-    <menu_item_call
+        function="Object.EnableTouch"
+        name="EnableTouch"
+        parameter="Touch" />
+  </menu_item_call>
+  <menu_item_call
+      label="Edit"
+      name="Edit...">
+    <menu_item_call.on_click
+        function="Object.Edit" />
+    <menu_item_call.on_enable
+        function="EnableEdit"/>
+  </menu_item_call>
+  <menu_item_call
       label="Build"
       name="Build">
-      <menu_item_call.on_click
+    <menu_item_call.on_click
         function="Object.Build" />
-        <menu_item_call.on_enable
-         function="EnableEdit"/>
-    </menu_item_call>
-   <menu_item_call
-     enabled="false"
-     label="Open"
-     name="Open">
-        <menu_item_call.on_click
-         function="Object.Open" />
-        <menu_item_call.on_enable
-         function="Object.EnableOpen" />
-   </menu_item_call>
-   <menu_item_call
-     enabled="false"
-     label="Sit Here"
-     name="Object Sit">
-        <menu_item_call.on_click
-         function="Object.SitOrStand" />
-        <menu_item_call.on_enable
-         function="Object.EnableSit" />
-   </menu_item_call>
-   <menu_item_call
-     enabled="false"
-     label="Stand Up"
-     name="Object Stand Up">
-        <menu_item_call.on_click
-         function="Object.SitOrStand" />
-        <menu_item_call.on_enable
-         function="Object.EnableStandUp" />
-   </menu_item_call>
-   <menu_item_call
-       label="Object Profile"
-       name="Object Inspect">
-         <menu_item_call.on_click
-          function="Object.Inspect" />
-         <menu_item_call.on_enable
-          function="Object.EnableInspect" />
-   </menu_item_call>
+    <menu_item_call.on_enable
+        function="EnableEdit"/>
+  </menu_item_call>
   <menu_item_call
-       label="Zoom In"
-       name="Zoom In">
+      label="Show in linksets"
+      name="show_in_linksets">
     <menu_item_call.on_click
-     function="Object.ZoomIn" />
+        function="Pathfinding.Linksets.Select" />
+    <menu_item_call.on_enable
+        function="EnableSelectInPathfindingLinksets"/>
+    <menu_item_call.on_visible
+        function="EnableSelectInPathfindingLinksets"/>
+  </menu_item_call>
+  <menu_item_call
+      label="Show in characters"
+      name="show_in_characters">
+    <menu_item_call.on_click
+        function="Pathfinding.Characters.Select" />
+    <menu_item_call.on_enable
+        function="EnableSelectInPathfindingCharacters"/>
+    <menu_item_call.on_visible
+        function="EnableSelectInPathfindingCharacters"/>
   </menu_item_call>
-<menu_item_separator layout="topleft" />
-   <context_menu
-         label="Put On"
-         name="Put On" >
-   <menu_item_call
+  <menu_item_call
       enabled="false"
-      label="Wear"
-      name="Wear">
-            <menu_item_call.on_click
-             function="Object.AttachToAvatar" />
-            <menu_item_call.on_enable
-             function="Object.EnableWear" />
-   </menu_item_call>
-   <menu_item_call
+      label="Open"
+      name="Open">
+    <menu_item_call.on_click
+        function="Object.Open" />
+    <menu_item_call.on_enable
+        function="Object.EnableOpen" />
+  </menu_item_call>
+  <menu_item_call
       enabled="false"
-      label="Add"
-      name="Add">
-            <menu_item_call.on_click
-             function="Object.AttachAddToAvatar" />
-            <menu_item_call.on_enable
-             function="Object.EnableWear" />
-   </menu_item_call>
-   <context_menu
-         label="Attach"
-         name="Object Attach" />
-   <context_menu
-         label="Attach HUD"
-         name="Object Attach HUD" />
-   </context_menu>
-   <context_menu
-         label="Manage"
-         name="Remove">
-   <menu_item_call
-         enabled="false"
-         label="Report Abuse"
-         name="Report Abuse...">
-            <menu_item_call.on_click
-             function="Object.ReportAbuse" />
-            <menu_item_call.on_enable
-             function="Object.EnableReportAbuse" />
-   </menu_item_call>
-   <menu_item_call
-          enabled="false"
-          label="Block"
-          name="Object Mute">
-             <menu_item_call.on_click
-              function="Object.Mute" />
-             <menu_item_call.on_enable
-              function="Object.EnableMute" />
-   </menu_item_call>
-   <menu_item_call
+      label="Sit Here"
+      name="Object Sit">
+    <menu_item_call.on_click
+        function="Object.SitOrStand" />
+    <menu_item_call.on_enable
+        function="Object.EnableSit" />
+  </menu_item_call>
+  <menu_item_call
       enabled="false"
-      label="Return"
-      name="Return...">
-         <menu_item_call.on_click
-          function="Object.Return" />
-         <menu_item_call.on_enable
-          function="Object.EnableReturn" />
-     </menu_item_call>
-    </context_menu>
-   <menu_item_separator layout="topleft" />
-   <menu_item_call
-     label="Take"
-     layout="topleft"
-     name="Pie Object Take">
+      label="Stand Up"
+      name="Object Stand Up">
+    <menu_item_call.on_click
+        function="Object.SitOrStand" />
+    <menu_item_call.on_enable
+        function="Object.EnableStandUp" />
+  </menu_item_call>
+  <menu_item_call
+      label="Object Profile"
+      name="Object Inspect">
+    <menu_item_call.on_click
+        function="Object.Inspect" />
+    <menu_item_call.on_enable
+        function="Object.EnableInspect" />
+  </menu_item_call>
+  <menu_item_call
+      label="Zoom In"
+      name="Zoom In">
+    <menu_item_call.on_click
+        function="Object.ZoomIn" />
+  </menu_item_call>
+  <menu_item_separator layout="topleft" />
+  <context_menu
+      label="Put On"
+      name="Put On" >
+    <menu_item_call
+        enabled="false"
+        label="Wear"
+        name="Wear">
       <menu_item_call.on_click
-       function="Object.Take"/>
+          function="Object.AttachToAvatar" />
       <menu_item_call.on_enable
-       function="Object.VisibleTake"/>
-   </menu_item_call>
-   <menu_item_call
-   enabled="false"
-   label="Take Copy"
-   name="Take Copy">
+          function="Object.EnableWear" />
+    </menu_item_call>
+    <menu_item_call
+        enabled="false"
+        label="Add"
+        name="Add">
       <menu_item_call.on_click
-       function="Tools.TakeCopy" />
+          function="Object.AttachAddToAvatar" />
       <menu_item_call.on_enable
-       function="Tools.EnableTakeCopy" />
-  </menu_item_call>
-   <menu_item_call
-   enabled="false"
-   label="Pay"
-   name="Pay...">
-  <menu_item_call.on_click
-   function="PayObject" />
-  <menu_item_call.on_enable
-   function="EnablePayObject" />
-</menu_item_call>
-  <menu_item_call
-   enabled="false"
-   label="Buy"
-   name="Buy...">
+          function="Object.EnableWear" />
+    </menu_item_call>
+    <context_menu
+        label="Attach"
+        name="Object Attach" />
+    <context_menu
+        label="Attach HUD"
+        name="Object Attach HUD" />
+  </context_menu>
+  <context_menu
+      label="Manage"
+      name="Remove">
+    <menu_item_call
+        enabled="false"
+        label="Report Abuse"
+        name="Report Abuse...">
+      <menu_item_call.on_click
+          function="Object.ReportAbuse" />
+      <menu_item_call.on_enable
+          function="Object.EnableReportAbuse" />
+    </menu_item_call>
+    <menu_item_call
+        enabled="false"
+        label="Block"
+        name="Object Mute">
       <menu_item_call.on_click
-       function="Object.Buy" />
+          function="Object.Mute" />
       <menu_item_call.on_enable
-       function="Object.EnableBuy" />
-   </menu_item_call>
-   <menu_item_call
-     enabled="false"
-     label="Delete"
-     name="Delete">
+          function="Object.EnableMute" />
+    </menu_item_call>
+    <menu_item_call
+        enabled="false"
+        label="Return"
+        name="Return...">
       <menu_item_call.on_click
-       function="Object.Delete" />
+          function="Object.Return" />
       <menu_item_call.on_enable
-       function="Object.EnableDelete" />
+          function="Object.EnableReturn" />
+    </menu_item_call>
+  </context_menu>
+  <menu_item_separator layout="topleft" />
+  <menu_item_call
+      label="Take"
+      layout="topleft"
+      name="Pie Object Take">
+    <menu_item_call.on_click
+        function="Object.Take"/>
+    <menu_item_call.on_enable
+        function="Object.VisibleTake"/>
+  </menu_item_call>
+  <menu_item_call
+      enabled="false"
+      label="Take Copy"
+      name="Take Copy">
+    <menu_item_call.on_click
+        function="Tools.TakeCopy" />
+    <menu_item_call.on_enable
+        function="Tools.EnableTakeCopy" />
+  </menu_item_call>
+  <menu_item_call
+      enabled="false"
+      label="Pay"
+      name="Pay...">
+    <menu_item_call.on_click
+        function="PayObject" />
+    <menu_item_call.on_enable
+        function="EnablePayObject" />
+  </menu_item_call>
+  <menu_item_call
+      enabled="false"
+      label="Buy"
+      name="Buy...">
+    <menu_item_call.on_click
+        function="Object.Buy" />
+    <menu_item_call.on_enable
+        function="Object.EnableBuy" />
+  </menu_item_call>
+  <menu_item_call
+      enabled="false"
+      label="Delete"
+      name="Delete">
+    <menu_item_call.on_click
+        function="Object.Delete" />
+    <menu_item_call.on_enable
+        function="Object.EnableDelete" />
   </menu_item_call>
 </context_menu>
-- 
cgit v1.2.3


From e9e1b4e8285481b1af2b6bdc7320312092644389 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 22 Jun 2012 16:25:02 -0700
Subject: PATH-760: Updating label copy for permanent objects to be affects
 navmesh.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index b0b4de3a0f..1602b48369 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3891,7 +3891,7 @@ Try enclosing path to the editor with double quotes.
   <!-- Pathfinding -->
   <string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
   <string name="Pathfinding_Object_Attr_None">None</string>
-  <string name="Pathfinding_Object_Attr_Permanent">Permanent</string>
+  <string name="Pathfinding_Object_Attr_Permanent">Affects navmesh</string>
   <string name="Pathfinding_Object_Attr_Character">Character</string>
   <string name="Pathfinding_Object_Attr_MultiSelect">(Multiple)</string>
 
-- 
cgit v1.2.3


From d893723cf637daf2a5a36671792d1a4135e8c4cf Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 22 Jun 2012 17:05:24 -0700
Subject: PATH-763: Updating the size and vertical positioning of the
 pathfinding icons in the slurl bar.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 0eec895b04..61ec046649 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -114,19 +114,17 @@
     />
   <pathfinding_dirty_icon
     name="pathfinding_dirty_icon"
-    width="14"
-    height="13"
-    top="19"
-    left="2"
+    width="22"
+    height="18"
+    top="21"
     follows="right|top"
     image_name="Pathfinding_Dirty"
     />
   <pathfinding_disabled_icon
     name="pathfinding_disabled_icon"
-    width="14"
-    height="13"
-    top="19"
-    left="2"
+    width="22"
+    height="18"
+    top="21"
     follows="right|top"
     image_name="Pathfinding_Disabled"
     />
-- 
cgit v1.2.3


From a1b6719c580223662481399f986a3dde9a7b3e10 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 22 Jun 2012 17:24:35 -0700
Subject: PATH-767: Updating the slurl icon tooltips and on-click
 notifications.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b7e336e095..c250b7c634 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5793,7 +5793,7 @@ This area has building disabled. You can&apos;t build or rez objects here.
      persist="true"
      type="notify">
     <unique/>
-    The pathfinding navmesh is not up-to-date on the current region.  If you have build rights, you may rebake the navmesh by clicking on the Rebake Region button.
+    The pathfinding navmesh has pending changes and is not up-to-date on the current region.  If you have build rights, you may rebake the navmesh by clicking on the Clean Up Region button.
   </notification>
 
   <notification
@@ -5802,7 +5802,7 @@ This area has building disabled. You can&apos;t build or rez objects here.
      persist="true"
      type="notify">
     <unique/>
-    Dynamic pathfinding is not enabled on this region.
+    Dynamic pathfinding is not enabled on this region.  Scripted objects with pathfinding LSL calls may not operate as expected on this region.
   </notification>
   
   <notification
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 1602b48369..4b396e24b1 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3325,8 +3325,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="LocationCtrlModerateIconTooltip">Moderate Region</string>
   <string name="LocationCtrlGeneralIconTooltip">General Region</string>
   <string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this parcel</string>
-  <string name="LocationCtrlPathfindingDirtyTooltip">The pathfinding navmesh is not up-to-date.</string>
-  <string name="LocationCtrlPathfindingDisabledTooltip">Dynamic pathfinding is not disabled on this region.</string>
+  <string name="LocationCtrlPathfindingDirtyTooltip">The pathfinding navmesh has pending changes.</string>
+  <string name="LocationCtrlPathfindingDisabledTooltip">Dynamic pathfinding is not enabled on this region.</string>
   <!-- Strings used by the (currently Linux) auto-updater app -->
 	<string name="UpdaterWindowTitle">
 	  [APP_NAME] Update
-- 
cgit v1.2.3


From 51fdc40d6f2c35dea90b3b6e6a6e1c1fd633854f Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Fri, 22 Jun 2012 17:58:14 -0700
Subject: PATH-767,PATH-779: Adding a notification for when the rebake button
 appears.  Also, updating some tooltip copy.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c250b7c634..b9f041ae3e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5793,7 +5793,7 @@ This area has building disabled. You can&apos;t build or rez objects here.
      persist="true"
      type="notify">
     <unique/>
-    The pathfinding navmesh has pending changes and is not up-to-date on the current region.  If you have build rights, you may rebake the navmesh by clicking on the Clean Up Region button.
+    The pathfinding navmesh has pending changes and is not up-to-date on the current region.  If you have build rights, you may rebake the navmesh by clicking on the “Clean up region” button.
   </notification>
 
   <notification
@@ -5804,7 +5804,27 @@ This area has building disabled. You can&apos;t build or rez objects here.
     <unique/>
     Dynamic pathfinding is not enabled on this region.  Scripted objects with pathfinding LSL calls may not operate as expected on this region.
   </notification>
-  
+
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingRebakeNavmesh"
+   type="alertmodal">
+    <unique/>
+    Changing certain objects in this region could cause other moving objects to behave incorrectly.  To make such objects work again, click the “Clean up region” button.  Choose “Help” to read more information.
+    <url
+      option="1"
+      name="url"
+      target = "_external">
+      http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+    </url>
+    <usetemplate
+     name="okhelpignore"
+     ignoretext="Changing certain objects in this region could cause other moving objects to behave incorrectly."
+     yestext="OK"
+     helptext="Help"
+     />
+  </notification>
+
   <notification
    icon="notify.tga"
    name="SeeAvatars"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4b396e24b1..a177054211 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3325,7 +3325,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="LocationCtrlModerateIconTooltip">Moderate Region</string>
   <string name="LocationCtrlGeneralIconTooltip">General Region</string>
   <string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this parcel</string>
-  <string name="LocationCtrlPathfindingDirtyTooltip">The pathfinding navmesh has pending changes.</string>
+  <string name="LocationCtrlPathfindingDirtyTooltip">Objects that move may not behave correctly in this region until the region is cleaned up.</string>
   <string name="LocationCtrlPathfindingDisabledTooltip">Dynamic pathfinding is not enabled on this region.</string>
   <!-- Strings used by the (currently Linux) auto-updater app -->
 	<string name="UpdaterWindowTitle">
-- 
cgit v1.2.3


From 855eeec9ef2aef2cca70b789cad0c92541eeb0fb Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Mon, 25 Jun 2012 12:26:02 -0700
Subject: sync with viewer-release

---
 .../default/xui/en/floater_hardware_settings.xml   |  22 ++
 .../skins/default/xui/en/floater_report_abuse.xml  |   1 +
 .../newview/skins/default/xui/en/floater_stats.xml |  41 ++-
 .../xui/en/floater_texture_fetch_debugger.xml      | 341 +++++++++++++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |  95 ++++--
 .../newview/skins/default/xui/en/notifications.xml |  38 ++-
 .../default/xui/en/panel_script_question_toast.xml |  55 ++++
 .../skins/default/xui/en/sidepanel_task_info.xml   |   8 +-
 indra/newview/skins/default/xui/en/strings.xml     |   1 +
 .../newview/skins/default/xui/ja/notifications.xml |  12 +
 10 files changed, 564 insertions(+), 50 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
 create mode 100644 indra/newview/skins/default/xui/en/panel_script_question_toast.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
index 66bb9d3cea..9deb0d2030 100644
--- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
@@ -132,6 +132,28 @@
      name="vbo"
      tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."
      width="315" />
+  <text
+    type="string"
+    length="1"
+    follows="left|top"
+    height="16"
+    layout="topleft"
+    left="10"
+    name="tc label"
+    top_pad="10"
+    width="188">
+    Enable S3TC:
+  </text>
+    <check_box
+     control_name="RenderCompressTextures"
+     height="16"
+     initial_value="true"
+     label="Enable Texture Compression (requires restart)"
+     layout="topleft"
+     left_pad="10"
+     name="texture compression"
+     tool_tip="Compresses textures in video memory, allowing for higher resolution textures to be loaded at the cost of some color quality."
+     width="315" />
     <slider
      control_name="TextureMemory"
      decimal_digits="0"
diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index e6d749a3f0..9561f67941 100644
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -155,6 +155,7 @@
      name="object_name"
      top_delta="0"
      translate="false"
+     parse_urls="false"
      use_ellipses="true"
      width="185">
         Consetetur Sadipscing
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index 2fd932786b..9400f7b94f 100644
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -149,13 +149,52 @@
 				 show_per_sec="true"
 				 show_bar="false">
 			  </stat_bar>
+       <stat_bar
+				 name="object_cache_hits"
+				 label="Object Cache Hit Rate"
+				 stat="object_cache_hits"
+				 bar_min="0"
+				 bar_max="100"
+         unit_label="%"
+				 tick_spacing="20"
+				 label_spacing="20"
+				 show_history="true"
+         show_per_sec="false"
+				 show_bar="false">
+        </stat_bar>
 			</stat_view>
         <!--Texture Stats-->
 			<stat_view
 			   name="texture"
 			   label="Texture"
 			   show_label="true">
-			  <stat_bar
+        <stat_bar
+				 name="texture_cache_hits"
+				 label="Cache Hit Rate"
+				 stat="texture_cache_hits"
+				 bar_min="0.f"
+				 bar_max="100.f"
+         unit_label="%"
+				 tick_spacing="20"
+				 label_spacing="20"
+				 show_history="true"
+         show_per_sec="false"
+				 show_bar="false">
+        </stat_bar>
+        <stat_bar
+				 name="texture_cache_read_latency"
+				 label="Cache Read Latency"
+         unit_label="msec"
+				 stat="texture_cache_read_latency"
+				 bar_min="0.f"
+				 bar_max="1000.f"
+				 tick_spacing="100"
+				 label_spacing="200"
+				 show_history="true"
+         show_per_sec="false"
+				 show_bar="false">
+        </stat_bar>
+        <stat_bar
 				 name="numimagesstat"
 				 label="Count"
 				 stat="numimagesstat" 
diff --git a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
new file mode 100644
index 0000000000..44b6a63bca
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
@@ -0,0 +1,341 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_minimize="false"
+ height="550"
+ layout="topleft"
+ name="TexFetchDebugger"
+ help_topic="texfetchdebugger"
+ title="Texture Fetching Debugger"
+ width="540">
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left="10"
+   name="total_num_fetched_label"
+   top="30"
+   width="400">
+    1, Total number of fetched textures: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_num_fetching_requests_label"
+   top_delta="25"
+   width="400">
+    2, Total number of fetching requests: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_num_cache_hits_label"
+   top_delta="25"
+   width="400">
+    3, Total number of cache hits: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_num_visible_tex_label"
+   top_delta="25"
+   width="400">
+    4, Total number of visible textures: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_num_visible_tex_fetch_req_label"
+   top_delta="25"
+   width="450">
+    5, Total number of visible texture fetching requests: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_fetched_data_label"
+   top_delta="25"
+   width="530">
+    6, Total number of fetched data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_fetched_vis_data_label"
+   top_delta="25"
+   width="480">
+    7, Total number of visible data: [SIZE1]KB, Decoded Data: [SIZE2]KB
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_fetched_rendered_data_label"
+   top_delta="25"
+   width="530">
+    8, Total number of rendered data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_cache_read_label"
+   top_delta="25"
+   width="400">
+    9, Total time on cache readings: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_cache_write_label"
+   top_delta="25"
+   width="400">
+    10, Total time on cache writings: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_decode_label"
+   top_delta="25"
+   width="400">
+    11, Total time on decodings: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_gl_label"
+   top_delta="25"
+   width="400">
+    12, Total time on gl texture creation: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_http_label"
+   top_delta="25"
+   width="400">
+    13, Total time on HTTP fetching: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_fetch_label"
+   top_delta="25"
+   width="400">
+    14, Total time on entire fetching: [TIME] seconds
+  </text>
+  <text
+  type="string"
+  length="1"
+  follows="left|top"
+  height="25"
+  layout="topleft"
+  left_delta="0"
+  name="total_time_refetch_vis_cache_label"
+  top_delta="25"
+  width="540">
+    15, Refetching visibles from cache, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
+  </text>
+  <text
+  type="string"
+  length="1"
+  follows="left|top"
+  height="25"
+  layout="topleft"
+  left_delta="0"
+  name="total_time_refetch_vis_http_label"
+  top_delta="25"
+  width="540">
+    16, Refetching visibles from HTTP, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
+  </text>
+  <spinner
+     decimal_digits="2"
+     follows="left|top"
+     height="20"
+     increment="0.01"
+     initial_value="1.0"
+     label="17, Ratio of Texel/Pixel:"
+     label_width="130"
+     layout="topleft"
+     left_delta="0"
+     max_val="10.0"
+     min_val="0.01"
+     name="texel_pixel_ratio"
+     top_delta="30"
+     width="200">
+    <spinner.commit_callback
+		function="TexFetchDebugger.ChangeTexelPixelRatio" />
+  </spinner>
+  <button
+   follows="left|top"
+   height="20"
+   label="Start"
+   layout="topleft"
+   left_delta="0"
+   name="start_btn"
+   top_delta="30"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.Start" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Reset"
+   layout="topleft"
+   left_pad="7"
+   name="clear_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.Clear" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Close"
+   layout="topleft"
+   left_pad="7"
+   name="close_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.Close" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Cache Read"
+   layout="topleft"
+   left="10"
+   name="cacheread_btn"
+   top_delta="30"
+   width="80">
+    <button.commit_callback
+		function="TexFetchDebugger.CacheRead" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Cache Write"
+   layout="topleft"
+   left_pad="7"
+   name="cachewrite_btn"
+   top_delta="0"
+   width="80">
+    <button.commit_callback
+		function="TexFetchDebugger.CacheWrite" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="HTTP"
+   layout="topleft"
+   left_pad="7"
+   name="http_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.HTTPLoad" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Decode"
+   layout="topleft"
+   left_pad="7"
+   name="decode_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.Decode" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="GL Texture"
+   layout="topleft"
+   left_pad="7"
+   name="gl_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.GLTexture" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Refetch Vis Cache"
+   layout="topleft"
+   left="10"
+   name="refetchviscache_btn"
+   top_delta="30"
+   width="120">
+    <button.commit_callback
+		function="TexFetchDebugger.RefetchVisCache" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Refetch Vis HTTP"
+   layout="topleft"
+   left_pad="7"
+   name="refetchvishttp_btn"
+   top_delta="0"
+   width="120">
+    <button.commit_callback
+		function="TexFetchDebugger.RefetchVisHTTP" />
+  </button>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 5ba566b175..a6898c554f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1876,7 +1876,7 @@
                 <menu_item_check.on_click
                  function="Advanced.ToggleConsole"
                  parameter="texture" />
-            </menu_item_check>
+            </menu_item_check>            
             <menu_item_check
              label="Debug Console"
              name="Debug Console"
@@ -1897,28 +1897,6 @@
                function="Floater.Toggle"
                parameter="notifications_console" />
             </menu_item_call>
-            <menu_item_check
-               label="Texture Size Console"
-               name="Texture Size"
-               shortcut="control|shift|6">
-              <menu_item_check.on_check
-               function="Advanced.CheckConsole"
-               parameter="texture size" />
-              <menu_item_check.on_click
-               function="Advanced.ToggleConsole"
-               parameter="texture size" />
-            </menu_item_check>
-            <menu_item_check
-               label="Texture Category Console"
-               name="Texture Category"
-               shortcut="control|shift|7">
-              <menu_item_check.on_check
-               function="Advanced.CheckConsole"
-               parameter="texture category" />
-              <menu_item_check.on_click
-               function="Advanced.ToggleConsole"
-               parameter="texture category" />
-            </menu_item_check>
             <menu_item_check
              label="Fast Timers"
              name="Fast Timers"
@@ -1953,7 +1931,20 @@
                function="Advanced.ToggleConsole"
                parameter="scene view" />
             </menu_item_check>
-
+            <menu_item_call
+              enabled="false"
+              visible="false"
+              label="Texture Fetch Debug Console"
+              name="Texture Fetch Debug Console">
+              <menu_item_call.on_click
+                function="Floater.Show"
+                parameter="tex_fetch_debugger" />
+              <on_enable
+                function="Develop.SetTexFetchDebugger" />
+              <on_visible
+                function="Develop.SetTexFetchDebugger" />
+            </menu_item_call>
+          
             <menu_item_separator/>
 
             <menu_item_call
@@ -2439,6 +2430,52 @@
            function="Advanced.ToggleInfoDisplay"
            parameter="sculpt" />
 		</menu_item_check>
+       <menu
+         create_jump_keys="true"
+         label="Texture Density"
+         name="Texture Density"
+         tear_off="true">
+          <menu_item_check
+           label="None"
+           name="None">
+            <menu_item_check.on_check
+             function="Advanced.CheckDisplayTextureDensity"
+             parameter="none" />
+            <menu_item_check.on_click
+             function="Advanced.SetDisplayTextureDensity"
+             parameter="none" />
+          </menu_item_check>
+          <menu_item_check
+           label="Current"
+           name="Current">
+            <menu_item_check.on_check
+             function="Advanced.CheckDisplayTextureDensity"
+             parameter="current" />
+            <menu_item_check.on_click
+             function="Advanced.SetDisplayTextureDensity"
+             parameter="current" />
+          </menu_item_check>
+          <menu_item_check
+           label="Desired"
+           name="Desired">
+            <menu_item_check.on_check
+             function="Advanced.CheckDisplayTextureDensity"
+             parameter="desired" />
+            <menu_item_check.on_click
+             function="Advanced.SetDisplayTextureDensity"
+             parameter="desired" />
+          </menu_item_check>
+          <menu_item_check
+           label="Full"
+           name="Full">
+            <menu_item_check.on_check
+             function="Advanced.CheckDisplayTextureDensity"
+             parameter="full" />
+            <menu_item_check.on_click
+             function="Advanced.SetDisplayTextureDensity"
+             parameter="full" />
+          </menu_item_check>
+        </menu>
       </menu>
         <menu
          create_jump_keys="true"
@@ -2605,16 +2642,6 @@
                  function="ToggleControl"
                  parameter="TextureLoadFullRes" />
             </menu_item_check>
-            <menu_item_check
-               label="Audit Textures"
-               name="Audit Textures">
-              <menu_item_check.on_check
-               function="CheckControl"
-               parameter="AuditTexture" />
-              <menu_item_check.on_click
-               function="ToggleControl"
-               parameter="AuditTexture" />
-            </menu_item_check>
             <menu_item_check
              label="Texture Atlas (experimental)"
              name="Texture Atlas">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index afc5b916e7..a26c5bb344 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1243,6 +1243,25 @@ Visit [_URL] for more information?
   <tag>fail</tag>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="IntelOldDriver"
+   type="alertmodal">
+     There is likely a newer driver for your graphics chip.  Updating graphics drivers can substantially improve performance.
+
+    Visit [_URL] to check for driver updates?
+    <tag>confirm</tag>
+    <url option="0" name="url">
+      http://www.intel.com/p/en_US/support/detect/graphics
+    </url>
+    <usetemplate
+     ignoretext="My graphics driver is out of date"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+    <tag>fail</tag>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="UnknownGPU"
@@ -6373,31 +6392,28 @@ Is this OK?
   <notification
    icon="notify.tga"
    name="ScriptQuestionCaution"
-   priority="high"
+   priority="critical"
    persist="true"
    type="notify">
-An object named &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, owned by &apos;[NAME]&apos; would like to:
-
-[QUESTIONS]
-If you do not trust this object and its creator, you should deny the request.
+Warning: The object &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; wants total access to your Linden Dollars account. If you allow access, it can remove funds from your account at any time, or empty your account completely, on an ongoing basis with no additional warnings.
+  
+It is rare that such a request is legitimate. Do not allow access if you do not fully understand why it wants access to your account.
 
-Grant this request?
   <tag>confirm</tag>
     <form name="form">
       <button
        index="0"
        name="Grant"
-       text="Grant"/>
+       text="Allow total access"/>
       <button
        default="true"
        index="1"
        name="Deny"
        text="Deny"/>
-      <button
-       index="2"
-       name="Details"
-       text="Details..."/>
     </form>
+    <footer>
+[FOOTERTEXT]
+    </footer>
   </notification>
 
   <notification
diff --git a/indra/newview/skins/default/xui/en/panel_script_question_toast.xml b/indra/newview/skins/default/xui/en/panel_script_question_toast.xml
new file mode 100644
index 0000000000..b0436bb6dc
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_script_question_toast.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<panel
+  background_opaque="false"
+  border_visible="false"
+  background_visible="true"
+  bg_alpha_color="PanelNotificationBackground"
+  bg_opaque_color="PanelNotificationBackground"
+  chrome="true"
+  height="270"
+  label="script_question_panel"
+  layout="topleft"
+  left="0"
+  name="panel_script_question_toast"
+  top="0"
+  width="305">
+    <text
+      follows="left|right|top"
+      font="SansSerifBold"
+      height="160"
+      layout="topleft"
+      left="10"
+      mouse_opaque="false"
+      name="top_info_message"
+      parse_highlights="true"
+      parse_urls="true"
+      text_color="NotifyCautionBoxColor"
+      top="10"
+      value=""
+      width="285"
+      wrap="true"/>
+    <panel
+      background_visible="false"
+      follows="left|right|top"
+      height="30"
+      label="buttons_panel"
+      layout="topleft"
+      name="buttons_panel"
+      top_pad="10"
+      width="285">
+    </panel>
+    <text
+      follows="all"
+      font="SansSerifBold"
+      height="55"
+      layout="topleft"
+      mouse_opaque="false"
+      name="bottom_info_message"
+      parse_highlights="true"
+      parse_urls="true"
+      text_color="NotifyCautionBoxColor"
+      top_pad="5"
+      value=""
+      width="285"
+      wrap="true"/>
+</panel>
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..bf2e6bc2d9 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -267,19 +267,19 @@
                 <combo_box.item
                  label="Touch  (default)"
                  name="Touch/grab(default)"
-                 value="Touch/grab (default)" />
+                 value="Touch" />
                 <combo_box.item
                  label="Sit on object"
                  name="Sitonobject"
-                 value="Sit on object" />
+                 value="Sit" />
                 <combo_box.item
                  label="Buy object"
                  name="Buyobject"
-                 value="Buy object" />
+                 value="Buy" />
                 <combo_box.item
                  label="Pay object"
                  name="Payobject"
-                 value="Pay object" />
+                 value="Pay" />
                 <combo_box.item
                  label="Open"
                  name="Open"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4ccec4838a..866ea296c3 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -393,6 +393,7 @@ Please try logging in again in a minute.</string>
   <string name="reconnect_nearby">You will now be reconnected to Nearby Voice Chat</string>
 	<string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</string>
 	<string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</string>
+	<string name="AdditionalPermissionsRequestHeader">If you allow access to your account, you will also be allowing the object to:</string>
 	<string name="ScriptTakeMoney">Take Linden dollars (L$) from you</string>
 	<string name="ActOnControlInputs">Act on your control inputs</string>
 	<string name="RemapControlInputs">Remap your control inputs</string>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 54031ccf12..7bf8a7b8be 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -2892,6 +2892,18 @@ M キーを押して変更します。
 
 次の住人と共有：
 
+[RESIDENTS]
+		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="Ok"/>
+	</notification>
+	<notification name="ShareFolderConfirmation">
+		フォルダは一度に 1 つしか共有できません。
+
+次のアイテムを共有しますか？
+
+&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
+
+次の住人と共有：
+
 [RESIDENTS]
 		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="Ok"/>
 	</notification>
-- 
cgit v1.2.3


From 1b8bbc7b863ccfc25833dcdbbf0dd9e3e96dc0bb Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 25 Jun 2012 17:04:32 -0400
Subject: PATH-773: fix up how the location and grid selectors work on the
 login panel

---
 indra/newview/skins/default/xui/en/notifications.xml | 10 +++++++++-
 indra/newview/skins/default/xui/en/panel_login.xml   | 11 -----------
 2 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b7e336e095..e4b2ea99b7 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -921,6 +921,14 @@ You need to enter either the Username or both the First and Last name of your av
 '[GRID]' is not a valid grid identifier.
   </notification>
   
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidLocationSLURL"
+   type="alertmodal">
+   <tag>fail</tag>
+Your start location did not specify a valid grid.
+  </notification>
+  
   <notification
    icon="alertmodal.tga"
    name="DeleteClassified"
@@ -1212,7 +1220,7 @@ There was a problem saving a compiled script due to the following reason: [REASO
    icon="alertmodal.tga"
    name="StartRegionEmpty"
    type="alertmodal">
-Oops, Your Start Region is not defined.
+Your Start Region is not defined.
 Please type the Region name in Start Location box or choose My Last Location or My Home as your Start Location.
 <tag>fail</tag>
     <usetemplate
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index d227920d9c..44702c828f 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -200,17 +200,6 @@
           right="-10"
           width="200">
       Need help logging in?   </text>
-      <!--  <text
-           follows="right|bottom"
-           font="SansSerifSmall"
-           halign="right"
-           height="28"
-           top_pad="2"
-           name="channel_text"
-           width="180"
-           word_wrap="true">
-           [VERSION]
-           </text>-->
     </layout_panel>
   </layout_stack>
 </panel>
-- 
cgit v1.2.3


From eff9be530805298339f656f86a52ade9efeba779 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 25 Jun 2012 17:12:28 -0400
Subject: fix line endings (no code change)

---
 .../xui/en/floater_texture_fetch_debugger.xml      | 682 ++++++++++-----------
 1 file changed, 341 insertions(+), 341 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
index 44b6a63bca..f3f8d4ddca 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
@@ -1,341 +1,341 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_minimize="false"
- height="550"
- layout="topleft"
- name="TexFetchDebugger"
- help_topic="texfetchdebugger"
- title="Texture Fetching Debugger"
- width="540">
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left="10"
-   name="total_num_fetched_label"
-   top="30"
-   width="400">
-    1, Total number of fetched textures: [NUM]
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_num_fetching_requests_label"
-   top_delta="25"
-   width="400">
-    2, Total number of fetching requests: [NUM]
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_num_cache_hits_label"
-   top_delta="25"
-   width="400">
-    3, Total number of cache hits: [NUM]
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_num_visible_tex_label"
-   top_delta="25"
-   width="400">
-    4, Total number of visible textures: [NUM]
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_num_visible_tex_fetch_req_label"
-   top_delta="25"
-   width="450">
-    5, Total number of visible texture fetching requests: [NUM]
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_fetched_data_label"
-   top_delta="25"
-   width="530">
-    6, Total number of fetched data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_fetched_vis_data_label"
-   top_delta="25"
-   width="480">
-    7, Total number of visible data: [SIZE1]KB, Decoded Data: [SIZE2]KB
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_fetched_rendered_data_label"
-   top_delta="25"
-   width="530">
-    8, Total number of rendered data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_cache_read_label"
-   top_delta="25"
-   width="400">
-    9, Total time on cache readings: [TIME] seconds
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_cache_write_label"
-   top_delta="25"
-   width="400">
-    10, Total time on cache writings: [TIME] seconds
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_decode_label"
-   top_delta="25"
-   width="400">
-    11, Total time on decodings: [TIME] seconds
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_gl_label"
-   top_delta="25"
-   width="400">
-    12, Total time on gl texture creation: [TIME] seconds
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_http_label"
-   top_delta="25"
-   width="400">
-    13, Total time on HTTP fetching: [TIME] seconds
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_fetch_label"
-   top_delta="25"
-   width="400">
-    14, Total time on entire fetching: [TIME] seconds
-  </text>
-  <text
-  type="string"
-  length="1"
-  follows="left|top"
-  height="25"
-  layout="topleft"
-  left_delta="0"
-  name="total_time_refetch_vis_cache_label"
-  top_delta="25"
-  width="540">
-    15, Refetching visibles from cache, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
-  </text>
-  <text
-  type="string"
-  length="1"
-  follows="left|top"
-  height="25"
-  layout="topleft"
-  left_delta="0"
-  name="total_time_refetch_vis_http_label"
-  top_delta="25"
-  width="540">
-    16, Refetching visibles from HTTP, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
-  </text>
-  <spinner
-     decimal_digits="2"
-     follows="left|top"
-     height="20"
-     increment="0.01"
-     initial_value="1.0"
-     label="17, Ratio of Texel/Pixel:"
-     label_width="130"
-     layout="topleft"
-     left_delta="0"
-     max_val="10.0"
-     min_val="0.01"
-     name="texel_pixel_ratio"
-     top_delta="30"
-     width="200">
-    <spinner.commit_callback
-		function="TexFetchDebugger.ChangeTexelPixelRatio" />
-  </spinner>
-  <button
-   follows="left|top"
-   height="20"
-   label="Start"
-   layout="topleft"
-   left_delta="0"
-   name="start_btn"
-   top_delta="30"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.Start" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Reset"
-   layout="topleft"
-   left_pad="7"
-   name="clear_btn"
-   top_delta="0"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.Clear" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Close"
-   layout="topleft"
-   left_pad="7"
-   name="close_btn"
-   top_delta="0"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.Close" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Cache Read"
-   layout="topleft"
-   left="10"
-   name="cacheread_btn"
-   top_delta="30"
-   width="80">
-    <button.commit_callback
-		function="TexFetchDebugger.CacheRead" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Cache Write"
-   layout="topleft"
-   left_pad="7"
-   name="cachewrite_btn"
-   top_delta="0"
-   width="80">
-    <button.commit_callback
-		function="TexFetchDebugger.CacheWrite" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="HTTP"
-   layout="topleft"
-   left_pad="7"
-   name="http_btn"
-   top_delta="0"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.HTTPLoad" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Decode"
-   layout="topleft"
-   left_pad="7"
-   name="decode_btn"
-   top_delta="0"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.Decode" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="GL Texture"
-   layout="topleft"
-   left_pad="7"
-   name="gl_btn"
-   top_delta="0"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.GLTexture" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Refetch Vis Cache"
-   layout="topleft"
-   left="10"
-   name="refetchviscache_btn"
-   top_delta="30"
-   width="120">
-    <button.commit_callback
-		function="TexFetchDebugger.RefetchVisCache" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Refetch Vis HTTP"
-   layout="topleft"
-   left_pad="7"
-   name="refetchvishttp_btn"
-   top_delta="0"
-   width="120">
-    <button.commit_callback
-		function="TexFetchDebugger.RefetchVisHTTP" />
-  </button>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_minimize="false"
+ height="550"
+ layout="topleft"
+ name="TexFetchDebugger"
+ help_topic="texfetchdebugger"
+ title="Texture Fetching Debugger"
+ width="540">
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left="10"
+   name="total_num_fetched_label"
+   top="30"
+   width="400">
+    1, Total number of fetched textures: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_num_fetching_requests_label"
+   top_delta="25"
+   width="400">
+    2, Total number of fetching requests: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_num_cache_hits_label"
+   top_delta="25"
+   width="400">
+    3, Total number of cache hits: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_num_visible_tex_label"
+   top_delta="25"
+   width="400">
+    4, Total number of visible textures: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_num_visible_tex_fetch_req_label"
+   top_delta="25"
+   width="450">
+    5, Total number of visible texture fetching requests: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_fetched_data_label"
+   top_delta="25"
+   width="530">
+    6, Total number of fetched data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_fetched_vis_data_label"
+   top_delta="25"
+   width="480">
+    7, Total number of visible data: [SIZE1]KB, Decoded Data: [SIZE2]KB
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_fetched_rendered_data_label"
+   top_delta="25"
+   width="530">
+    8, Total number of rendered data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_cache_read_label"
+   top_delta="25"
+   width="400">
+    9, Total time on cache readings: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_cache_write_label"
+   top_delta="25"
+   width="400">
+    10, Total time on cache writings: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_decode_label"
+   top_delta="25"
+   width="400">
+    11, Total time on decodings: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_gl_label"
+   top_delta="25"
+   width="400">
+    12, Total time on gl texture creation: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_http_label"
+   top_delta="25"
+   width="400">
+    13, Total time on HTTP fetching: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_fetch_label"
+   top_delta="25"
+   width="400">
+    14, Total time on entire fetching: [TIME] seconds
+  </text>
+  <text
+  type="string"
+  length="1"
+  follows="left|top"
+  height="25"
+  layout="topleft"
+  left_delta="0"
+  name="total_time_refetch_vis_cache_label"
+  top_delta="25"
+  width="540">
+    15, Refetching visibles from cache, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
+  </text>
+  <text
+  type="string"
+  length="1"
+  follows="left|top"
+  height="25"
+  layout="topleft"
+  left_delta="0"
+  name="total_time_refetch_vis_http_label"
+  top_delta="25"
+  width="540">
+    16, Refetching visibles from HTTP, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
+  </text>
+  <spinner
+     decimal_digits="2"
+     follows="left|top"
+     height="20"
+     increment="0.01"
+     initial_value="1.0"
+     label="17, Ratio of Texel/Pixel:"
+     label_width="130"
+     layout="topleft"
+     left_delta="0"
+     max_val="10.0"
+     min_val="0.01"
+     name="texel_pixel_ratio"
+     top_delta="30"
+     width="200">
+    <spinner.commit_callback
+		function="TexFetchDebugger.ChangeTexelPixelRatio" />
+  </spinner>
+  <button
+   follows="left|top"
+   height="20"
+   label="Start"
+   layout="topleft"
+   left_delta="0"
+   name="start_btn"
+   top_delta="30"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.Start" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Reset"
+   layout="topleft"
+   left_pad="7"
+   name="clear_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.Clear" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Close"
+   layout="topleft"
+   left_pad="7"
+   name="close_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.Close" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Cache Read"
+   layout="topleft"
+   left="10"
+   name="cacheread_btn"
+   top_delta="30"
+   width="80">
+    <button.commit_callback
+		function="TexFetchDebugger.CacheRead" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Cache Write"
+   layout="topleft"
+   left_pad="7"
+   name="cachewrite_btn"
+   top_delta="0"
+   width="80">
+    <button.commit_callback
+		function="TexFetchDebugger.CacheWrite" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="HTTP"
+   layout="topleft"
+   left_pad="7"
+   name="http_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.HTTPLoad" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Decode"
+   layout="topleft"
+   left_pad="7"
+   name="decode_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.Decode" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="GL Texture"
+   layout="topleft"
+   left_pad="7"
+   name="gl_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.GLTexture" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Refetch Vis Cache"
+   layout="topleft"
+   left="10"
+   name="refetchviscache_btn"
+   top_delta="30"
+   width="120">
+    <button.commit_callback
+		function="TexFetchDebugger.RefetchVisCache" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Refetch Vis HTTP"
+   layout="topleft"
+   left_pad="7"
+   name="refetchvishttp_btn"
+   top_delta="0"
+   width="120">
+    <button.commit_callback
+		function="TexFetchDebugger.RefetchVisHTTP" />
+  </button>
+</floater>
-- 
cgit v1.2.3


From bf86a697313869627f8b7025ecd68032f2556f6f Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 25 Jun 2012 15:37:18 -0700
Subject: PATH-717: Minor UI changes from Leo.  Also, adding a notification
 when attempting to return or delete multiple items.

---
 .../xui/en/floater_pathfinding_characters.xml      | 24 +++++++++----------
 .../xui/en/floater_pathfinding_linksets.xml        | 22 ++++++++---------
 .../newview/skins/default/xui/en/notifications.xml | 28 +++++++++++++++++++++-
 3 files changed, 50 insertions(+), 24 deletions(-)

(limited to 'indra/newview/skins')

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 a267902b94..c1f1f60c1b 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -179,14 +179,24 @@
     <button
         follows="left|bottom"
         height="22"
+        label="Teleport me to it"
+        layout="topleft"
+        name="teleport_me_to_object"
+        tool_tip="Enabled only when one character is selected."
+        top_pad="-22"
+        left_pad="26"
+        width="159"/>
+    <button
+        follows="right|bottom"
+        height="22"
         label="Return"
         layout="topleft"
         name="return_objects"
         top_pad="-22"
-        left_pad="6"
+        left_pad="26"
         width="94"/>
     <button
-        follows="left|bottom"
+        follows="right|bottom"
         height="22"
         label="Delete"
         layout="topleft"
@@ -194,15 +204,5 @@
         top_pad="-22"
         left_pad="6"
         width="94"/>
-    <button
-        follows="left|bottom"
-        height="22"
-        label="Teleport me to it"
-        layout="topleft"
-        name="teleport_me_to_object"
-        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_linksets.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
index 3e718743dc..833e5489ba 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -322,14 +322,23 @@
     <button
         follows="left|bottom"
         height="21"
+        label="Teleport me to it"
+        layout="topleft"
+        name="teleport_me_to_object"
+        top_pad="-21"
+        left_pad="206"
+        width="160"/>
+    <button
+        follows="right|bottom"
+        height="21"
         label="Return"
         layout="topleft"
         name="return_objects"
         top_pad="-21"
-        left_pad="6"
+        left_pad="220"
         width="95"/>
     <button
-        follows="left|bottom"
+        follows="right|bottom"
         height="21"
         label="Delete"
         layout="topleft"
@@ -337,15 +346,6 @@
         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_object"
-        top_pad="-21"
-        left_pad="6"
-        width="160"/>
   </panel>
   <view_border
       bevel_style="none"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 922ddcedd8..d4e0d16821 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7861,5 +7861,31 @@ Disabling future updates for this file.
 Attempted to add an invalid or unreadable image file [FNAME] which could not be opened or decoded.
 Attempt cancelled.
   </notification>
-  
+
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingReturnMultipleItems"
+   type="alertmodal">
+    You are returning [NUM_ITEMS] items.  Are you sure you want to continue?
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Are you sure you want to return multiple items?"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingDeleteMultipleItems"
+   type="alertmodal">
+    You are deleting [NUM_ITEMS] items.  Are you sure you want to continue?
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Are you sure you want to delete multiple items?"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
 </notifications>
-- 
cgit v1.2.3


From c9fea8b43cfb50d1e8406ea87f47c51daea7cef1 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Mon, 25 Jun 2012 18:17:56 -0700
Subject: PATH-718: Disabling the view/test menu in the case of a stubbed
 llphysicsextensions library.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1682996c74..f9a4acb1e3 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -967,7 +967,7 @@
               function="Floater.ToggleOrBringToFront"
               parameter="pathfinding_console" />
           <menu_item_call.on_enable
-              function="Tools.EnablePathfinding" />
+              function="Tools.EnablePathfindingView" />
         </menu_item_call>
       </menu>
 
-- 
cgit v1.2.3


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

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

(limited to 'indra/newview/skins')

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


From 01545997da201e04731b14eb720765a19470974d Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 27 Jun 2012 13:30:01 -0700
Subject: PATH-788: Adding more state information for the rebake region button
 to capture and display the rebaking states.  Also, altering how the stop
 flying button works so that it does not hide the entire panel.

---
 indra/newview/skins/default/xui/en/notifications.xml   | 12 ++++++++++++
 .../skins/default/xui/en/panel_navmesh_rebake.xml      | 18 +++++++++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b09fb7bbe8..ea06e3a321 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5852,6 +5852,18 @@ This area has building disabled. You can&apos;t build or rez objects here.
      />
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingCannotRebakeNavmesh"
+   type="alertmodal">
+    <unique/>
+    You are not allowed to rebake the navmesh at the current time.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"
+     />
+  </notification>
+
   <notification
    icon="notify.tga"
    name="SeeAvatars"
diff --git a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
index c7bf91efb4..ddfba4c43d 100644
--- a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
+++ b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
@@ -17,7 +17,19 @@
       top="2"
       visible="false"
       enabled="true"
-      width="113" />
+      width="120" />
+  <button
+      follows="left|bottom"
+      height="19"
+      label="Sending rebake request"
+      layout="topleft"
+      left="10"
+      name="navmesh_btn_sending"
+      tool_tip="Sending rebake request"
+      top="2"
+      visible="false"
+      enabled="false"
+      width="120" />
   <button
       follows="left|bottom"
       height="19"
@@ -25,10 +37,10 @@
       layout="topleft"
       left="10"
       name="navmesh_btn_baking"
-      tool_tip="Region is cleaning up."
+      tool_tip="Region is cleaning."
       top="2"
       visible="false"
       enabled="false"
-      width="113" />
+      width="120" />
 </panel>
 
-- 
cgit v1.2.3


From edf5a3f8f6f8a0c6263e1b9e20553243412bad22 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 27 Jun 2012 14:22:08 -0700
Subject: Minor changes to pathfinding-specific wordings.

---
 .../newview/skins/default/xui/en/notifications.xml | 26 ++++++++++------------
 .../skins/default/xui/en/panel_navmesh_rebake.xml  | 12 +++++-----
 indra/newview/skins/default/xui/en/strings.xml     |  2 +-
 3 files changed, 19 insertions(+), 21 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index ea06e3a321..837637a54e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1533,9 +1533,7 @@ Please make sure none are locked, and that you own all of them.
    icon="alertmodal.tga"
    name="CannotLinkPermanent"
    type="alertmodal">
-Unable to link permanent objects.
-
-Please move all objects to the same region, and then attempt to link the objects together again.
+    Objects cannot be linked across region boundaries.
     <tag>fail</tag>
   </notification>
 
@@ -5820,7 +5818,7 @@ This area has building disabled. You can&apos;t build or rez objects here.
      persist="true"
      type="notify">
     <unique/>
-    The pathfinding navmesh has pending changes and is not up-to-date on the current region.  If you have build rights, you may rebake the navmesh by clicking on the “Clean up region” button.
+    The region has pending pathfinding changes.  If you have build rights, you may rebake the region by clicking on the “Rebake region” button.
   </notification>
 
   <notification
@@ -5829,7 +5827,7 @@ This area has building disabled. You can&apos;t build or rez objects here.
      persist="true"
      type="notify">
     <unique/>
-    Dynamic pathfinding is not enabled on this region.  Scripted objects with pathfinding LSL calls may not operate as expected on this region.
+    Dynamic pathfinding is not enabled on this region.  Scripted objects using pathfinding LSL calls may not operate as expected on this region.
   </notification>
 
   <notification
@@ -5837,7 +5835,7 @@ This area has building disabled. You can&apos;t build or rez objects here.
    name="PathfindingRebakeNavmesh"
    type="alertmodal">
     <unique/>
-    Changing certain objects in this region could cause other moving objects to behave incorrectly.  To make such objects work again, click the “Clean up region” button.  Choose “Help” to read more information.
+    Changing certain objects in this region could cause other moving objects to behave incorrectly.  To make moving objects behave correctly, click the “Rebake region” button.  Choose “Help” for more information.
     <url
       option="1"
       name="url"
@@ -5857,7 +5855,7 @@ This area has building disabled. You can&apos;t build or rez objects here.
    name="PathfindingCannotRebakeNavmesh"
    type="alertmodal">
     <unique/>
-    You are not allowed to rebake the navmesh at the current time.
+    An error occurred.  There may be a network or server problem, or you may not have build rights.  Sometimes logging out and back in will solve this problem.
     <usetemplate
      name="okbutton"
      yestext="OK"
@@ -7777,7 +7775,7 @@ The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;
     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?"
+     ignoretext="Some selected linksets cannot be set because of permission restrictions on the linkset."
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
@@ -7787,10 +7785,10 @@ The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;
    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.
+    Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because the shape is non-convex.
     <tag>confirm</tag>
     <usetemplate
-     ignoretext="Do you wish to proceed?"
+     ignoretext="Some selected linksets cannot be set because the shape is non-convex"
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
@@ -7801,10 +7799,10 @@ The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;
    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.
+ Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because the shape is non-convex. These linksets&apos; use types will not change.
     <tag>confirm</tag>
     <usetemplate
-     ignoretext="Do you wish to proceed?"
+     ignoretext="Some selected linksets cannot be set because of permission restrictions on the linkset and because the shape is non-convex."
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
@@ -7814,10 +7812,10 @@ The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;
    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?
+    The selected object affects the navmesh.  Changing it to a Flexible Path will remove it from the navmesh.
     <tag>confirm</tag>
     <usetemplate
-     ignoretext="Do you wish to proceed?"
+     ignoretext="The selected object affects the navmesh.  Changing it to a Flexible Path will remove it from the navmesh."
      name="okcancelignore"
      notext="Cancel"
      yestext="OK"/>
diff --git a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
index ddfba4c43d..c9bbaa1a21 100644
--- a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
+++ b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
@@ -9,11 +9,11 @@
   <button
       follows="left|bottom"
       height="19"
-      label="Clean up region"
+      label="Rebake region"
       layout="topleft"
       left="10"
       name="navmesh_btn"
-      tool_tip="Click here to rebake the region&apos;s navmesh."
+      tool_tip="Click to rebake the region&apos;s navmesh."
       top="2"
       visible="false"
       enabled="true"
@@ -21,11 +21,11 @@
   <button
       follows="left|bottom"
       height="19"
-      label="Sending rebake request"
+      label="Requesting rebake"
       layout="topleft"
       left="10"
       name="navmesh_btn_sending"
-      tool_tip="Sending rebake request"
+      tool_tip="Sending rebake request to the server."
       top="2"
       visible="false"
       enabled="false"
@@ -33,11 +33,11 @@
   <button
       follows="left|bottom"
       height="19"
-      label="Region is cleaning"
+      label="Region is rebaking"
       layout="topleft"
       left="10"
       name="navmesh_btn_baking"
-      tool_tip="Region is cleaning."
+      tool_tip="Region is being rebaked.  When completed, this button will disappear."
       top="2"
       visible="false"
       enabled="false"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 142103f03b..064cea5ae7 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3326,7 +3326,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="LocationCtrlModerateIconTooltip">Moderate Region</string>
   <string name="LocationCtrlGeneralIconTooltip">General Region</string>
   <string name="LocationCtrlSeeAVsTooltip">Avatars visible and chat allowed outside of this parcel</string>
-  <string name="LocationCtrlPathfindingDirtyTooltip">Objects that move may not behave correctly in this region until the region is cleaned up.</string>
+  <string name="LocationCtrlPathfindingDirtyTooltip">Objects that move may not behave correctly in this region until the region is rebaked.</string>
   <string name="LocationCtrlPathfindingDisabledTooltip">Dynamic pathfinding is not enabled on this region.</string>
   <!-- Strings used by the (currently Linux) auto-updater app -->
 	<string name="UpdaterWindowTitle">
-- 
cgit v1.2.3


From 685a672b74550ca0dbf8a816257c84c9c44fd34d Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 28 Jun 2012 15:37:55 -0700
Subject: Cleaning up new files in preparation for merge into viewer-release.

---
 .../default/xui/en/floater_pathfinding_characters.xml    | 16 ++++++++--------
 .../skins/default/xui/en/panel_navmesh_rebake.xml        |  1 -
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'indra/newview/skins')

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 c1f1f60c1b..4331e1f340 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -150,14 +150,14 @@
         left_pad="0"
         width="150" />
     <check_box
-     height="19"
-     follows="left|bottom"
-     label="Show physics capsule"
-     layout="topleft"
-     name="show_physics_capsule"
-     top_pad="-19"
-     left_pad="0"
-     width="150" />
+        height="19"
+        follows="left|bottom"
+        label="Show physics capsule"
+        layout="topleft"
+        name="show_physics_capsule"
+        top_pad="-19"
+        left_pad="0"
+        width="150" />
     <button
         follows="left|bottom"
         height="22"
diff --git a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
index c9bbaa1a21..90308a2ca9 100644
--- a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
+++ b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
@@ -43,4 +43,3 @@
       enabled="false"
       width="120" />
 </panel>
-
-- 
cgit v1.2.3


From f0fd5525d70bfea090c7686702acbe7df6ffed49 Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Tue, 3 Jul 2012 12:38:47 -0700
Subject: FIX INTL-99 set32 translation for 8 languages

---
 .../default/xui/de/floater_hardware_settings.xml   |  4 ++
 .../newview/skins/default/xui/de/floater_stats.xml |  3 ++
 .../skins/default/xui/de/floater_texture_ctrl.xml  | 31 +++++++----
 .../xui/de/floater_texture_fetch_debugger.xml      | 62 ++++++++++++++++++++++
 .../skins/default/xui/de/floater_window_size.xml   | 15 ++++--
 indra/newview/skins/default/xui/de/menu_viewer.xml | 10 ++--
 .../newview/skins/default/xui/de/notifications.xml | 33 +++++++++---
 .../default/xui/de/panel_script_question_toast.xml |  4 ++
 indra/newview/skins/default/xui/de/strings.xml     |  6 +++
 .../default/xui/es/floater_hardware_settings.xml   |  4 ++
 .../newview/skins/default/xui/es/floater_stats.xml |  3 ++
 .../skins/default/xui/es/floater_texture_ctrl.xml  | 31 +++++++----
 .../xui/es/floater_texture_fetch_debugger.xml      | 62 ++++++++++++++++++++++
 .../skins/default/xui/es/floater_window_size.xml   | 15 ++++--
 indra/newview/skins/default/xui/es/menu_viewer.xml |  9 +++-
 .../newview/skins/default/xui/es/notifications.xml | 43 +++++++++------
 .../default/xui/es/panel_script_question_toast.xml |  4 ++
 indra/newview/skins/default/xui/es/strings.xml     |  6 +++
 .../default/xui/fr/floater_hardware_settings.xml   |  4 ++
 .../newview/skins/default/xui/fr/floater_stats.xml |  5 +-
 .../skins/default/xui/fr/floater_texture_ctrl.xml  | 31 +++++++----
 .../xui/fr/floater_texture_fetch_debugger.xml      | 62 ++++++++++++++++++++++
 .../skins/default/xui/fr/floater_window_size.xml   | 15 ++++--
 indra/newview/skins/default/xui/fr/menu_viewer.xml | 10 ++--
 .../newview/skins/default/xui/fr/notifications.xml | 32 ++++++++---
 .../default/xui/fr/panel_script_question_toast.xml |  4 ++
 indra/newview/skins/default/xui/fr/strings.xml     |  6 +++
 .../default/xui/it/floater_hardware_settings.xml   |  4 ++
 .../newview/skins/default/xui/it/floater_stats.xml |  3 ++
 .../skins/default/xui/it/floater_texture_ctrl.xml  | 31 +++++++----
 .../xui/it/floater_texture_fetch_debugger.xml      | 62 ++++++++++++++++++++++
 .../skins/default/xui/it/floater_window_size.xml   | 15 ++++--
 indra/newview/skins/default/xui/it/menu_viewer.xml |  9 +++-
 .../newview/skins/default/xui/it/notifications.xml | 33 +++++++++---
 .../default/xui/it/panel_script_question_toast.xml |  4 ++
 indra/newview/skins/default/xui/it/strings.xml     |  6 +++
 .../default/xui/ja/floater_hardware_settings.xml   |  4 ++
 .../newview/skins/default/xui/ja/floater_stats.xml |  3 ++
 .../skins/default/xui/ja/floater_texture_ctrl.xml  | 31 +++++++----
 .../xui/ja/floater_texture_fetch_debugger.xml      | 62 ++++++++++++++++++++++
 .../skins/default/xui/ja/floater_window_size.xml   | 15 ++++--
 indra/newview/skins/default/xui/ja/menu_viewer.xml | 10 ++--
 .../newview/skins/default/xui/ja/notifications.xml | 45 +++++++++-------
 .../default/xui/ja/panel_script_question_toast.xml |  4 ++
 indra/newview/skins/default/xui/ja/strings.xml     |  6 +++
 .../default/xui/pt/floater_hardware_settings.xml   |  4 ++
 .../newview/skins/default/xui/pt/floater_stats.xml |  3 ++
 .../skins/default/xui/pt/floater_texture_ctrl.xml  | 31 +++++++----
 .../xui/pt/floater_texture_fetch_debugger.xml      | 62 ++++++++++++++++++++++
 .../skins/default/xui/pt/floater_window_size.xml   | 15 ++++--
 indra/newview/skins/default/xui/pt/menu_viewer.xml |  9 +++-
 .../newview/skins/default/xui/pt/notifications.xml | 33 +++++++++---
 .../default/xui/pt/panel_script_question_toast.xml |  4 ++
 indra/newview/skins/default/xui/pt/strings.xml     |  6 +++
 .../default/xui/ru/floater_hardware_settings.xml   |  4 ++
 .../newview/skins/default/xui/ru/floater_stats.xml |  3 ++
 .../skins/default/xui/ru/floater_texture_ctrl.xml  | 15 +++++-
 .../xui/ru/floater_texture_fetch_debugger.xml      | 62 ++++++++++++++++++++++
 .../skins/default/xui/ru/floater_window_size.xml   | 15 ++++--
 indra/newview/skins/default/xui/ru/menu_viewer.xml | 10 ++--
 .../newview/skins/default/xui/ru/notifications.xml | 33 +++++++++---
 .../default/xui/ru/panel_script_question_toast.xml |  4 ++
 indra/newview/skins/default/xui/ru/strings.xml     |  6 +++
 .../default/xui/tr/floater_hardware_settings.xml   |  4 ++
 .../newview/skins/default/xui/tr/floater_stats.xml |  3 ++
 .../skins/default/xui/tr/floater_texture_ctrl.xml  | 15 +++++-
 .../xui/tr/floater_texture_fetch_debugger.xml      | 62 ++++++++++++++++++++++
 .../skins/default/xui/tr/floater_window_size.xml   | 15 ++++--
 indra/newview/skins/default/xui/tr/menu_viewer.xml | 10 ++--
 .../newview/skins/default/xui/tr/notifications.xml | 33 +++++++++---
 .../default/xui/tr/panel_script_question_toast.xml |  4 ++
 indra/newview/skins/default/xui/tr/strings.xml     |  6 +++
 72 files changed, 1130 insertions(+), 202 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml
 create mode 100644 indra/newview/skins/default/xui/de/panel_script_question_toast.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_script_question_toast.xml
 create mode 100644 indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_script_question_toast.xml
 create mode 100644 indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml
 create mode 100644 indra/newview/skins/default/xui/it/panel_script_question_toast.xml
 create mode 100644 indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
 create mode 100644 indra/newview/skins/default/xui/ja/panel_script_question_toast.xml
 create mode 100644 indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml
 create mode 100644 indra/newview/skins/default/xui/pt/panel_script_question_toast.xml
 create mode 100644 indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml
 create mode 100644 indra/newview/skins/default/xui/ru/panel_script_question_toast.xml
 create mode 100644 indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml
 create mode 100644 indra/newview/skins/default/xui/tr/panel_script_question_toast.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
index ca081aafae..fd6c9a0875 100644
--- a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
@@ -25,6 +25,10 @@
 		VBO aktivieren:
 	</text>
 	<check_box initial_value="true" label="OpenGL Vertex-Buffer-Objekte aktivieren" name="vbo" tool_tip="Wenn Sie über moderne Grafikhardware verfügen, können Sie durch Aktivieren dieser Option die Geschwindigkeit verbessern.  Bei alter Hardware sind die VBO oft schlecht implementiert, was zu Abstürzen führen kann, wenn diese Option aktiviert ist."/>
+	<text name="tc label">
+		S3TC aktivieren:
+	</text>
+	<check_box initial_value="true" label="Texturkomprimierung aktivieren (Neustart erforderlich)" name="texture compression" tool_tip="Komprimiert Texturen im Videospeicher, damit höher auflösende Texturen geladen werden können (leichte Beeinträchtigung der Farbqualität)."/>
 	<slider label="Texturen-Cache (MB):" name="GraphicsCardTextureMemory" tool_tip="Speicherplatz, der für Texturen zur Verfügung steht. In der Regel handelt es sich um Grafikkartenspeicher. Ein kleinerer Wert kann die Geschwindigkeit erhöhen, aber auch zu Texturunschärfen führen."/>
 	<spinner label="Nebeldistanzverhältnis:" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>
diff --git a/indra/newview/skins/default/xui/de/floater_stats.xml b/indra/newview/skins/default/xui/de/floater_stats.xml
index f6dc9fe15d..92d057a4fe 100644
--- a/indra/newview/skins/default/xui/de/floater_stats.xml
+++ b/indra/newview/skins/default/xui/de/floater_stats.xml
@@ -14,8 +14,11 @@
 					<stat_bar label="Pro Sek. gezeichnete KTris" name="ktrissec"/>
 					<stat_bar label="Objektanzahl" name="objs"/>
 					<stat_bar label="Neue Objekte" name="newobjs"/>
+					<stat_bar label="Objektcache-Trefferrate" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="Textur" name="texture">
+					<stat_bar label="Cache-Trefferrate" name="texture_cache_hits"/>
+					<stat_bar label="Cache-Leselatenz" name="texture_cache_read_latency"/>
 					<stat_bar label="Zählen" name="numimagesstat"/>
 					<stat_bar label="Rohanzahl" name="numrawimagesstat"/>
 					<stat_bar label="GL Sp" name="gltexmemstat"/>
diff --git a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
index 8944c79c7d..5bb96bebc4 100644
--- a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
@@ -1,24 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="TEXTUR AUSWÄHLEN">
-	<string name="choose_picture">
+	<floater.string name="choose_picture">
 		Zum Auswählen eines Bildes hier klicken
-	</string>
+	</floater.string>
+	<floater.string name="pick title">
+		Auswählen:
+	</floater.string>
 	<text name="Multiple">
 		Mehrere Texturen
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="Inventar" name="inventory" value="0"/>
+		<radio_item label="Lokal" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		Größe: [DIMENSIONS]
 	</text>
 	<button label="Standard" label_selected="Standard" name="Default"/>
-	<button label="Keine" label_selected="Keine" name="None"/>
 	<button label="Leer" label_selected="Leer" name="Blank"/>
-	<check_box label="Ordner anzeigen" name="show_folders_check"/>
-	<search_editor label="Texturen filtern" name="inventory search editor"/>
-	<check_box label="Jetzt übernehmen" name="apply_immediate_check"/>
+	<button label="Keine" label_selected="Keine" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
+	<filter_editor label="Texturen filtern" name="inventory search editor"/>
+	<check_box initial_value="false" label="Ordner anzeigen" name="show_folders_check"/>
+	<button label="Hinzufügen" label_selected="Hinzufügen" name="l_add_btn"/>
+	<button label="Entfernen" label_selected="Entfernen" name="l_rem_btn"/>
+	<button label="Hochladen" label_selected="Hochladen" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="Name" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
 	<button label="OK" label_selected="OK" name="Select"/>
-	<text name="pick title">
-		Auswählen:
-	</text>
+	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
+	<check_box initial_value="true" label="Jetzt übernehmen" name="apply_immediate_check"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml
new file mode 100644
index 0000000000..0f407cb15c
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="Debugger für Texturabruffehler">
+	<text name="total_num_fetched_label">
+		1, Gesamtzahl abgerufener Texturen: [NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, Gesamtzahl von Abrufanforderungen: [NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, Gesamtzahl von Cachetreffern: [NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, Gesamtzahl sichtbarer Texturen: [NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, Gesamtzahl von Abrufanforderungen für sichtbare Texturen: [NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, Gesamtmenge abgerufener Daten: [SIZE1] KB, decodierte Daten: [SIZE2] KB, [PIXEL] MPixel
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, Gesamtmenge sichtbarer Daten: [SIZE1] KB, decodierte Daten: [SIZE2] KB
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, Gesamtmenge dargestellter Daten: [SIZE1] KB, decodierte Daten: [SIZE2] KB, [PIXEL] MPixel
+	</text>
+	<text name="total_time_cache_read_label">
+		9, Gesamtzeit Cache-Lesezugriffe: [TIME] s
+	</text>
+	<text name="total_time_cache_write_label">
+		10, Gesamtzeit Cache-Schreibzugriffe: [TIME] s
+	</text>
+	<text name="total_time_decode_label">
+		11, Gesamtzeit Decodierung: [TIME] s
+	</text>
+	<text name="total_time_gl_label">
+		12, Gesamtzeit GL-Texturerstellung: [TIME] s
+	</text>
+	<text name="total_time_http_label">
+		13, Gesamtzeit HTTP-Abrufe: [TIME] s
+	</text>
+	<text name="total_time_fetch_label">
+		14, Gesamtzeit für alle Abrufe: [TIME] s
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, Neuabruf sichtbarer Texturen aus Cache, Zeit: [TIME] s, Abrufmenge: [SIZE2] KB, [PIXEL] MPixel
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		16, Neuabruf sichtbarer Texturen von HTTP, Zeit: [TIME] s, Abrufmenge: [SIZE2] KB, [PIXEL] MPixel
+	</text>
+	<spinner label="17, Verhältnis Texel/Pixel:" name="texel_pixel_ratio"/>
+	<button label="Starten" name="start_btn"/>
+	<button label="Zurücksetzen" name="clear_btn"/>
+	<button label="Schließen" name="close_btn"/>
+	<button label="Cache-Lesezugriff" name="cacheread_btn"/>
+	<button label="Cache-Schreibzugriff" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="Decodieren" name="decode_btn"/>
+	<button label="GL-Textur" name="gl_btn"/>
+	<button label="Neuabruf sichtbarer Texturen (Cache)" name="refetchviscache_btn"/>
+	<button label="Neuabruf sichtbarer Texturen (HTTP)" name="refetchvishttp_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_window_size.xml b/indra/newview/skins/default/xui/de/floater_window_size.xml
index a2a53e0567..6502f002a1 100644
--- a/indra/newview/skins/default/xui/de/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/de/floater_window_size.xml
@@ -7,10 +7,17 @@
 		Fenstergröße einstellen:
 	</text>
 	<combo_box name="window_size_combo" tool_tip="Breite x Höhe">
-		<combo_box.item label="1000 x 700 (Standard)" name="item0"/>
-		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 (720p)" name="item2"/>
-		<combo_box.item label="1920 x 1080 (1080p)" name="item3"/>
+		<combo_box.item label="1000 x 700 (Standard)" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
 	</combo_box>
 	<button label="Festlegen" name="set_btn"/>
 	<button label="Abbrechen" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index d011c7295c..856f91e214 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -227,11 +227,10 @@
 			<menu_item_check label="Textur" name="Texture Console"/>
 			<menu_item_check label="Fehler beseitigen" name="Debug Console"/>
 			<menu_item_call label="Meldungen" name="Notifications"/>
-			<menu_item_check label="Texturgröße" name="Texture Size"/>
-			<menu_item_check label="Texture-Kategorie" name="Texture Category"/>
 			<menu_item_check label="Schnelle Timer" name="Fast Timers"/>
 			<menu_item_check label="Speicher" name="Memory"/>
 			<menu_item_check label="Szenestatistiken" name="Scene Statistics"/>
+			<menu_item_call label="Debug-Konsole für Texturabruffehler" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="Info zu Region in Fenster Fehler beseitigen" name="Region Info to Debug Console"/>
 			<menu_item_call label="Gruppeninfo in Fenster Fehler beseitigen" name="Group Info to Debug Console"/>
 			<menu_item_call label="Info zu Fähigkeiten in Fenster Fehler beseitigen" name="Capabilities Info to Debug Console"/>
@@ -289,6 +288,12 @@
 			<menu_item_check label="Komplexität beim Rendern" name="rendercomplexity"/>
 			<menu_item_check label="Byte in Anhängen" name="attachment bytes"/>
 			<menu_item_check label="Formen" name="Sculpt"/>
+			<menu label="Texturdichte" name="Texture Density">
+				<menu_item_check label="Keine" name="None"/>
+				<menu_item_check label="Aktuelle" name="Current"/>
+				<menu_item_check label="Gewünschte" name="Desired"/>
+				<menu_item_check label="Volle" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Achsen" name="Axes"/>
@@ -306,7 +311,6 @@
 			<menu_item_check label="Animationstexturen" name="Animation Textures"/>
 			<menu_item_check label="Texturen deaktivieren" name="Disable Textures"/>
 			<menu_item_check label="Voll-Res-Texturen" name="Rull Res Textures"/>
-			<menu_item_check label="Texturen prüfen" name="Audit Textures"/>
 			<menu_item_check label="Textur-Atlas (experimentell)" name="Texture Atlas"/>
 			<menu_item_check label="Angehängte Lichter rendern" name="Render Attached Lights"/>
 			<menu_item_check label="Angehängte Partikel rendern" name="Render Attached Particles"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index ac068fcd4e..f7274d31e1 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -502,6 +502,15 @@ Weitere Informationen finden Sie auf [_URL].
 		</url>
 		<usetemplate ignoretext="Meine Hardware wird nicht unterstützt" name="okcancelignore" notext="Nein" yestext="Ja"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip. Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern.
+
+    Unter [_URL] nach aktualisierten Treibern suchen?
+		<url name="url">
+			http://www.intel.com/p/de_DE/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Ihr System verwendet eine Grafikkarte, die [APP_NAME] nicht erkennt.
 Dies passiert dann, wenn die neue Hardware noch nicht mit [APP_NAME] getestet wurde.  Wahrscheinlich wird das Programm richtig ausgeführt, aber Sie müssen eventuell ein paar Grafikeinstellungen vornehmen.
@@ -2628,16 +2637,12 @@ Ist das OK?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Das Objekt „&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;“, das „[NAME]“ gehört, stellt folgende Anfrage:
-
-[QUESTIONS]
-Wenn Sie diesem Objekt und seinem Ersteller nicht vertrauen, sollten Sie diese Anfrage ablehnen.
-
-Anfrage gestatten?
+		Achtung: Das Objekt „&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;“ fordert uneingeschränkten Zugriff auf Ihr Linden-Dollar-Konto an. Wenn Sie Zugriff gewähren, kann dieses Objekt jederzeit und ohne weitere Warnung Ihr Konto belasten bzw. ganz leeren.
+  
+Eine solche Anforderung ist nur in seltenen Fällen legitim. Gewähren Sie dem Objekt nur dann Zugriff, wenn Sie genau verstehen, wieso ein solcher Zugriff auf Ihr Konto erforderlich ist.
 		<form name="form">
-			<button name="Grant" text="Gewähren"/>
+			<button name="Grant" text="Uneingeschränkten Zugriff gewähren"/>
 			<button name="Deny" text="Verweigern"/>
-			<button name="Details" text="Info..."/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
@@ -3135,4 +3140,16 @@ Ansonsten können Sie auf der Karte nachsehen und dort Ort suchen, die als „In
 	<global name="You died and have been teleported to your home location">
 		Sie sind gestorben und wurden zu Ihrem Zuhause teleportiert.
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		[FNAME] wurde nicht gefunden und konnte deshalb nicht aktualisiert werden.
+Zukünftige Aktualisierungen dieser Datei werden deaktiviert.
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[FNAME] konnte auch nach [NRETRIES] Versuchen nicht geöffnet oder decodiert werden und gilt als beschädigt.
+Zukünftige Aktualisierungen dieser Datei werden deaktiviert.
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		Versuch, eine ungültige oder nicht lesbare Bilddatei ([FNAME]) hinzuzufügen, die nicht geöffnet oder decodiert werden konnte.
+Versuch abgebrochen.
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/de/panel_script_question_toast.xml b/indra/newview/skins/default/xui/de/panel_script_question_toast.xml
new file mode 100644
index 0000000000..a2d0237da0
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_script_question_toast.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index d917d33d12..668a7b35bf 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -886,6 +886,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="ScriptQuestionCautionChatDenied">
 		Dem Objekt „[OBJECTNAME]“, ein Objekt von „[OWNERNAME]“, in [REGIONNAME] [REGIONPOS], wurde folgende Berechtigung verweigert: [PERMISSIONS].
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		Wenn Sie dem Objekt Zugriff auf Ihr Konto gewähren, kann dieses außerdem:
+	</string>
 	<string name="ScriptTakeMoney">
 		Linden-Dollar (L$) von Ihnen nehmen
 	</string>
@@ -919,6 +922,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="ControlYourCamera">
 		Kamerasteuerung
 	</string>
+	<string name="TeleportYourAgent">
+		Sie teleportieren
+	</string>
 	<string name="NotConnected">
 		Nicht verbunden
 	</string>
diff --git a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
index b96076836b..c351db5eae 100644
--- a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
@@ -25,6 +25,10 @@
 		Activar VBO:
 	</text>
 	<check_box initial_value="true" label="Activar OpenGL Vertex Buffer Objects" name="vbo" tool_tip="En hardware moderno, habilitar esta opción mejora el rendimiento. Pero en hardware antiguo, el habilitarlo hace que, frecuentemente, se obtenga una implementación pobre de VBO, lo que puede provocarle caídas."/>
+	<text name="tc label">
+		Activar S3TC:
+	</text>
+	<check_box initial_value="verdadero" label="Activar la compresión de texturas (requiere reiniciar)" name="texture compression" tool_tip="Comprime las texturas de la memoria de vídeo, lo cual permite cargar texturas de una resolución más alta, pero con una cierta pérdida de calidad del color."/>
 	<slider label="Memoria para texturas (MB):" name="GraphicsCardTextureMemory" tool_tip="Cantidad de memoria asignada a las texturas. Por defecto es la memoria de la tarjeta de vídeo. Reducir esta cantidad puede mejorar el rendimiento, pero también hacer que las texturas se vean borrosas."/>
 	<spinner label="Intensidad de la niebla:" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>
diff --git a/indra/newview/skins/default/xui/es/floater_stats.xml b/indra/newview/skins/default/xui/es/floater_stats.xml
index ba4af2e866..d53ae88126 100644
--- a/indra/newview/skins/default/xui/es/floater_stats.xml
+++ b/indra/newview/skins/default/xui/es/floater_stats.xml
@@ -14,8 +14,11 @@
 					<stat_bar label="KTris generados por segundo" name="ktrissec"/>
 					<stat_bar label="Objetos en total" name="objs"/>
 					<stat_bar label="Objetos nuevos" name="newobjs"/>
+					<stat_bar label="Índice de aciertos de caché de objetos" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="Textura" name="texture">
+					<stat_bar label="Índice de aciertos de caché" name="texture_cache_hits"/>
+					<stat_bar label="Latencia de lectura de caché" name="texture_cache_read_latency"/>
 					<stat_bar label="Número" name="numimagesstat"/>
 					<stat_bar label="Raw: número" name="numrawimagesstat"/>
 					<stat_bar label="GL Mem" name="gltexmemstat"/>
diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
index ed2787ea60..1e566e3e31 100644
--- a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
@@ -1,24 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="DESTACADO: TEXTURA">
-	<string name="choose_picture">
+	<floater.string name="choose_picture">
 		Pulse para elegir una imagen
-	</string>
+	</floater.string>
+	<floater.string name="pick title">
+		Elegir:
+	</floater.string>
 	<text name="Multiple">
 		Texturas múltiples
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="Inventario" name="inventory" value="0"/>
+		<radio_item label="Local" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		Tamaño: [DIMENSIONS]
 	</text>
 	<button label="Por defecto" label_selected="Por defecto" name="Default" width="84"/>
-	<button label="Ninguna" label_selected="Ninguna" left="90" name="None"/>
 	<button label="Blanca" label_selected="Blanca" name="Blank"/>
-	<check_box label="Ver las carpetas" name="show_folders_check"/>
-	<search_editor label="Filtrar las texturas" name="inventory search editor"/>
-	<check_box label="Aplicarlo ahora" name="apply_immediate_check"/>
+	<button label="Ninguna" label_selected="Ninguna" left="90" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<filter_editor label="Filtrar las texturas" name="inventory search editor"/>
+	<check_box initial_value="false" label="Ver las carpetas" name="show_folders_check"/>
+	<button label="Añadir" label_selected="Añadir" name="l_add_btn"/>
+	<button label="Eliminar" label_selected="Eliminar" name="l_rem_btn"/>
+	<button label="Subir" label_selected="Subir" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="Nombre" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
 	<button label="OK" label_selected="OK" name="Select"/>
-	<string name="pick title">
-		Elegir:
-	</string>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<check_box initial_value="true" label="Aplicarlo ahora" name="apply_immediate_check"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml
new file mode 100644
index 0000000000..29fd2ab2a3
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="Depurador de obtención de texturas">
+	<text name="total_num_fetched_label">
+		1, Número total de texturas obtenidas: [NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, Número total de solicitudes de obtención: [NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, Número total de aciertos de caché: [NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, Número total de texturas visibles: [NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, Número total de solicitudes de obtención de texturas visibles: [NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, Número total de datos obtenidos: [SIZE1] KB, Datos descodificados: [SIZE2] KB, [PIXEL] MPíxeles
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, Número total de datos visibles: [SIZE1] KB, Datos descodificados: [SIZE2] KB
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, Número total de datos representados: [SIZE1] KB, Datos descodificados: [SIZE2] KB, [PIXEL] MPíxeles
+	</text>
+	<text name="total_time_cache_read_label">
+		9, Tiempo total en lecturas de caché: [TIME] segundos
+	</text>
+	<text name="total_time_cache_write_label">
+		10, Tiempo total en escrituras de caché: [TIME] segundos
+	</text>
+	<text name="total_time_decode_label">
+		11, Tiempo total en descodificaciones: [TIME] segundos
+	</text>
+	<text name="total_time_gl_label">
+		12, Tiempo total en la creación de texturas gl: [TIME] segundos
+	</text>
+	<text name="total_time_http_label">
+		13, Tiempo total en obtención de HTTP: [TIME] segundos
+	</text>
+	<text name="total_time_fetch_label">
+		14, Tiempo total en obtención completa: [TIME] segundos
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, Volviendo a obtener visibles de la caché, Tiempo: [TIME] segundos, Obtenidos: [SIZE] KB, [PIXEL] MPíxeles
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		16, Volviendo a obtener visibles de HTTP, Tiempo: [TIME] segundos, Obtenidos: [SIZE] KB, [PIXEL] MPíxeles
+	</text>
+	<spinner label="17, Proporción de texeles/píxeles:" name="texel_pixel_ratio"/>
+	<button label="Iniciar" name="start_btn"/>
+	<button label="Restablecer" name="clear_btn"/>
+	<button label="Cerrar" name="close_btn"/>
+	<button label="Lectura de caché" name="cacheread_btn"/>
+	<button label="Escritura de caché" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="Descodificar" name="decode_btn"/>
+	<button label="Textura GL" name="gl_btn"/>
+	<button label="Volver a obtener caché de vis." name="refetchviscache_btn"/>
+	<button label="Volver a obtener HTTP de vis." name="refetchvishttp_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_window_size.xml b/indra/newview/skins/default/xui/es/floater_window_size.xml
index f57ce08eac..6c1ad02319 100644
--- a/indra/newview/skins/default/xui/es/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/es/floater_window_size.xml
@@ -7,10 +7,17 @@
 		Definir el tamaño de la ventana:
 	</text>
 	<combo_box name="window_size_combo" tool_tip="ancho x alto">
-		<combo_box.item label="1000 x 700 (por defecto)" name="item0"/>
-		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 (720 p)" name="item2"/>
-		<combo_box.item label="1920 x 1080 (1080 p)" name="item3"/>
+		<combo_box.item label="1000 x 700 (por defecto)" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
 	</combo_box>
 	<button label="Configurar" name="set_btn"/>
 	<button label="Cancelar" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 9522d4eac6..740bd35cbb 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -225,11 +225,10 @@
 			<menu_item_check label="Texture Console" name="Texture Console"/>
 			<menu_item_check label="Debug Console" name="Debug Console"/>
 			<menu_item_call label="Notifications Console" name="Notifications"/>
-			<menu_item_check label="Texture Size Console" name="Texture Size"/>
-			<menu_item_check label="Texture Category Console" name="Texture Category"/>
 			<menu_item_check label="Fast Timers" name="Fast Timers"/>
 			<menu_item_check label="Memory" name="Memory"/>
 			<menu_item_check label="Datos de la escena" name="Scene Statistics"/>
+			<menu_item_call label="Consola de depuración de obtención de texturas" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="Region Info to Debug Console" name="Region Info to Debug Console"/>
 			<menu_item_check label="Camera" name="Camera"/>
 			<menu_item_check label="Wind" name="Wind"/>
@@ -270,6 +269,12 @@
 			<menu_item_check label="Complejidad del renderizado" name="rendercomplexity"/>
 			<menu_item_check label="Bytes de adjunto" name="attachment bytes"/>
 			<menu_item_check label="Esculpir" name="Sculpt"/>
+			<menu label="Densidad de textura" name="Texture Density">
+				<menu_item_check label="Ninguna" name="None"/>
+				<menu_item_check label="Actual" name="Current"/>
+				<menu_item_check label="Deseada" name="Desired"/>
+				<menu_item_check label="Completa" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Axes" name="Axes"/>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index d47c3d7ad8..af7a7b088a 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -490,6 +490,15 @@ El objeto debe de haber sido borrado o estar fuera de rango (&apos;out of range&
 		</url>
 		<usetemplate ignoretext="El hardware de mi ordenador no está admitido" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		Probablemente ya existe un controlador más reciente para tu procesador de gráficos. La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento.
+
+    ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados?
+		<url name="url">
+			http://www.intel.com/p/es_XL/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Tu sistema usa una tarjeta gráfica que [APP_NAME] no reconoce.
 Suele suceder con hardware nuevo que todavía no ha sido probado con [APP_NAME].  Probablemente todo irá bien, pero deberás ajustar tus configuraciones gráficas.
@@ -2622,33 +2631,23 @@ Del objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propietario: [NAME]?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Un objeto de nombre &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, propiedad de &apos;[NAME]&apos;, quiere:
-
-[QUESTIONS]
-Si no confias en este objeto y en su creador, deberías rehusar esta petición.
-
-¿Autorizar esta petición?
+		Atención: El objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; solicita un acceso total a tu cuenta de dólares Linden. Si le autorizas el acceso, podrá retirar fondos de tu cuenta en cualquier momento o vaciarla por completo, de manera permanente y sin más advertencias.
+  
+Estas solicitudes pocas veces son legítimas. No autorices el acceso si no conoces la razón exacta por la que desea el acceso a tu cuenta.
 		<form name="form">
-			<button name="Grant" text="Autorizar"/>
+			<button name="Grant" text="Permitir acceso total"/>
 			<button name="Deny" text="Denegar"/>
-			<button name="Details" text="Detalles..."/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
 		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; de [NAME]
 [MESSAGE]
-		<form name="form">
-			<button name="Mute" text="Ignorar"/>
-			<button name="Ignore" text="Ignorar"/>
-		</form>
+		<form name="form"/>
 	</notification>
 	<notification name="ScriptDialogGroup">
 		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; de [GROUPNAME]
 [MESSAGE]
-		<form name="form">
-			<button name="Mute" text="Ignorar"/>
-			<button name="Ignore" text="Ignorar"/>
-		</form>
+		<form name="form"/>
 	</notification>
 	<notification name="BuyLindenDollarSuccess">
 		¡Gracias por tu pago!
@@ -3126,4 +3125,16 @@ También puedes buscar en el Mapa lugares marcados como &quot;Puntos de Informac
 	<global name="You died and have been teleported to your home location">
 		Has muerto y te has teleportado a tu Base.
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		[FNAME] no se ha podido actualizar porque el archivo ya no se encuentra.
+Desactivando futuras actualizaciones de este archivo.
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[FNAME] se ha intentado abrir o descodificar durante [NRETRIES] intentos sin éxito, y ahora se considera roto.
+Desactivando futuras actualizaciones de este archivo.
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		Se ha intentado añadir un archivo de imagen [FNAME] no válido o ilegible, que no se puede abrir ni descodificar.
+Intento cancelado.
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/es/panel_script_question_toast.xml b/indra/newview/skins/default/xui/es/panel_script_question_toast.xml
new file mode 100644
index 0000000000..a2d0237da0
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_script_question_toast.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 67c65c6ce9..adc32ba168 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -871,6 +871,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="ScriptQuestionCautionChatDenied">
 		A &apos;[OBJECTNAME]&apos;, un objeto propiedad de &apos;[OWNERNAME]&apos;, localizado en [REGIONNAME] con la posición [REGIONPOS], se le ha denegado el permiso para: [PERMISSIONS].
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		Si autorizas el acceso a tu cuenta, también permitirás al objeto:
+	</string>
 	<string name="ScriptTakeMoney">
 		Cogerle a usted dólares Linden (L$)
 	</string>
@@ -904,6 +907,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="ControlYourCamera">
 		Controlar su cámara
 	</string>
+	<string name="TeleportYourAgent">
+		Teleportarte
+	</string>
 	<string name="SIM_ACCESS_PG">
 		General
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
index 2bc76e0c63..098f8fc713 100644
--- a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
@@ -25,6 +25,10 @@
 		Activer le VBO :
 	</text>
 	<check_box initial_value="true" label="Activer OpenGL Vertex Buffer Objects" name="vbo" tool_tip="Sur un matériel moderne, cette option permet une meilleure performance. Par contre, sur un matériel plus ancien, les VBO sont souvent mal implémentés et peuvent causer des crashs lorsqu&apos;ils sont activés."/>
+	<text name="tc label">
+		Activer S3TC :
+	</text>
+	<check_box initial_value="vraie" label="Activer la compression des textures (redémarrage requis)" name="texture compression" tool_tip="Comprime les textures en mémoire vidéo afin de permettre de charger des textures de résolution plus élevée au prix d&apos;une certaine qualité de couleur."/>
 	<slider label="Mémoire textures (Mo) :" name="GraphicsCardTextureMemory" tool_tip="Quantité de mémoire à affecter aux textures. Utilise la mémoire de la carte vidéo par défaut. Si vous réduisez ce paramètre, cela peut améliorer les performances, mais les textures risquent d&apos;être floues."/>
 	<spinner label="Indice du brouillard :" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_stats.xml b/indra/newview/skins/default/xui/fr/floater_stats.xml
index 2ce2e6dcd5..56fa062d46 100644
--- a/indra/newview/skins/default/xui/fr/floater_stats.xml
+++ b/indra/newview/skins/default/xui/fr/floater_stats.xml
@@ -14,8 +14,11 @@
 					<stat_bar label="KTris par s" name="ktrissec"/>
 					<stat_bar label="Objets totaux" name="objs"/>
 					<stat_bar label="Nouveaux objets" name="newobjs"/>
+					<stat_bar label="Taux de réussite du cache des objets" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="Texture" name="texture">
+					<stat_bar label="Taux de réussite du cache" name="texture_cache_hits"/>
+					<stat_bar label="Latence de lecture du cache" name="texture_cache_read_latency"/>
 					<stat_bar label="Nombre" name="numimagesstat"/>
 					<stat_bar label="Nombre brut" name="numrawimagesstat"/>
 					<stat_bar label="Mém GL" name="gltexmemstat"/>
@@ -57,7 +60,7 @@
 				<stat_bar label="Chargements en attente" name="simpendinguploads"/>
 				<stat_bar label="Total Unacked Bytes" name="simtotalunackedbytes"/>
 				<stat_view label="Temps (ms)" name="simperf">
-					<stat_bar label="Durée totale de l'image" name="simframemsec"/>
+					<stat_bar label="Durée totale de l&apos;image" name="simframemsec"/>
 					<stat_bar label="Durée nette" name="simnetmsec"/>
 					<stat_bar label="Durée sim (physique)" name="simsimphysicsmsec"/>
 					<stat_bar label="Durée sim (autre)" name="simsimothermsec"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
index 381bcceb00..ca0fbd3589 100644
--- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
@@ -1,24 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="CHOISIR : TEXTURE">
-	<string name="choose_picture">
+	<floater.string name="choose_picture">
 		Cliquez pour sélectionner une image
-	</string>
+	</floater.string>
+	<floater.string name="pick title">
+		Choisir :
+	</floater.string>
 	<text name="Multiple">
 		Textures multiples
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="Inventaire" name="inventory" value="0"/>
+		<radio_item label="Local" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		Taille : [DIMENSIONS]
 	</text>
 	<button label="Défaut" label_selected="Défaut" name="Default" width="60"/>
-	<button label="Aucune" label_selected="Aucune" left="68" name="None" width="60"/>
 	<button label="Vierge" label_selected="Vierge" name="Blank" width="60"/>
-	<check_box label="Afficher les dossiers" name="show_folders_check"/>
-	<search_editor label="Filtrer les textures" name="inventory search editor"/>
-	<check_box label="Appliquer maintenant" name="apply_immediate_check"/>
+	<button label="Aucune" label_selected="Aucune" left="68" name="None" width="60"/>
 	<button bottom="-240" label="" label_selected="" name="Pipette"/>
-	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
+	<filter_editor label="Filtrer les textures" name="inventory search editor"/>
+	<check_box initial_value="false" label="Afficher les dossiers" name="show_folders_check"/>
+	<button label="Ajouter" label_selected="Ajouter" name="l_add_btn"/>
+	<button label="Supprimer" label_selected="Supprimer" name="l_rem_btn"/>
+	<button label="Charger" label_selected="Charger" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="Nom" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
 	<button label="OK" label_selected="OK" name="Select"/>
-	<string name="pick title">
-		Choisir :
-	</string>
+	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
+	<check_box initial_value="true" label="Appliquer maintenant" name="apply_immediate_check"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml
new file mode 100644
index 0000000000..f0cc95319d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="Outil de débogage de la récupération des textures">
+	<text name="total_num_fetched_label">
+		1, nombre total de textures récupérées : [NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, nombre total de demandes de récupération : [NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, nombre total de présences dans le cache : [NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, nombre total de textures visibles : [NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, nombre total de demandes de récupération de textures visibles : [NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, nombre total de données récupérées : [SIZE1] Ko, données décodées : [SIZE2] Ko, [PIXEL] Mpixels
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, nombre total de données visibles : [SIZE1] Ko, données décodées : [SIZE2] Ko
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, nombre total de données rendues : [SIZE1] Ko, données décodées : [SIZE2] Ko, [PIXEL] Mpixels
+	</text>
+	<text name="total_time_cache_read_label">
+		9, durée totale des lectures du cache : [TIME] secondes
+	</text>
+	<text name="total_time_cache_write_label">
+		10, durée totale des écritures du cache : [TIME] secondes
+	</text>
+	<text name="total_time_decode_label">
+		11, durée totale des décodages : [TIME] secondes
+	</text>
+	<text name="total_time_gl_label">
+		12, durée totale de la création de textures GL : [TIME] secondes
+	</text>
+	<text name="total_time_http_label">
+		13, durée totale de la récupération HTTP : [TIME] secondes
+	</text>
+	<text name="total_time_fetch_label">
+		14, durée totale de la récupération intégrale : [TIME] secondes
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, nouvelle récupération des données visibles du cache, Durée : [TIME] secondes, Récupéré : [SIZE] Ko, [PIXEL] Mpixels
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		16, nouvelle récupération des données visibles de la requête HTTP, Durée : [TIME] secondes, Récupéré : [SIZE] Ko, [PIXEL] Mpixels
+	</text>
+	<spinner label="17, taux de texels/pixels :" name="texel_pixel_ratio"/>
+	<button label="Démarrer" name="start_btn"/>
+	<button label="Réinitialiser" name="clear_btn"/>
+	<button label="Fermer" name="close_btn"/>
+	<button label="Lecture du cache" name="cacheread_btn"/>
+	<button label="Écriture du cache" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="Décoder" name="decode_btn"/>
+	<button label="Texture GL" name="gl_btn"/>
+	<button label="Récupérer à nouveau les données visibles du cache" name="refetchviscache_btn"/>
+	<button label="Récupérer à nouveau les données visibles de la requête HTTP" name="refetchvishttp_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_window_size.xml b/indra/newview/skins/default/xui/fr/floater_window_size.xml
index cbda4390d8..11c2e439bd 100644
--- a/indra/newview/skins/default/xui/fr/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/fr/floater_window_size.xml
@@ -7,10 +7,17 @@
 		Définir la taille de la fenêtre :
 	</text>
 	<combo_box name="window_size_combo" tool_tip="largeur x hauteur">
-		<combo_box.item label="1 000 x 700 (défaut)" name="item0"/>
-		<combo_box.item label="1 024 x 768" name="item1"/>
-		<combo_box.item label="1 280 x 720 (720 p)" name="item2"/>
-		<combo_box.item label="1 920 x 1 080 (1 080p)" name="item3"/>
+		<combo_box.item label="1000 x 700 (par défaut)" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
 	</combo_box>
 	<button label="Choisir" name="set_btn"/>
 	<button label="Annuler" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 3c3d4f5f69..2a26ed7a70 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -227,11 +227,10 @@
 			<menu_item_check label="Console de textures" name="Texture Console"/>
 			<menu_item_check label="Console de débogage" name="Debug Console"/>
 			<menu_item_call label="Console de notifications" name="Notifications"/>
-			<menu_item_check label="Console de tailles de textures" name="Texture Size"/>
-			<menu_item_check label="Console des catégories de textures" name="Texture Category"/>
 			<menu_item_check label="Chronos" name="Fast Timers"/>
 			<menu_item_check label="Mémoire" name="Memory"/>
 			<menu_item_check label="Statistiques de la scène" name="Scene Statistics"/>
+			<menu_item_call label="Console de débogage de la récupération des textures" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="Infos de région vers la console de débogage" name="Region Info to Debug Console"/>
 			<menu_item_call label="Infos de groupe vers la console de débogage" name="Group Info to Debug Console"/>
 			<menu_item_call label="Infos de capacités vers la console de débogage" name="Capabilities Info to Debug Console"/>
@@ -289,6 +288,12 @@
 			<menu_item_check label="Complexité du rendu" name="rendercomplexity"/>
 			<menu_item_check label="Octets d&apos;éléments attachés" name="attachment bytes"/>
 			<menu_item_check label="Sculpture" name="Sculpt"/>
+			<menu label="Densité des textures" name="Texture Density">
+				<menu_item_check label="Aucune" name="None"/>
+				<menu_item_check label="Actuelle" name="Current"/>
+				<menu_item_check label="Souhaitée" name="Desired"/>
+				<menu_item_check label="Complète" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="Rendu" name="Rendering">
 			<menu_item_check label="Axes" name="Axes"/>
@@ -306,7 +311,6 @@
 			<menu_item_check label="Textures d&apos;animation" name="Animation Textures"/>
 			<menu_item_check label="Désactiver les textures" name="Disable Textures"/>
 			<menu_item_check label="Textures pleine résolution" name="Rull Res Textures"/>
-			<menu_item_check label="Audit Textures" name="Audit Textures"/>
 			<menu_item_check label="Atlas des textures (expérimental)" name="Texture Atlas"/>
 			<menu_item_check label="Rendu des lumières jointes" name="Render Attached Lights"/>
 			<menu_item_check label="Rendu des particules jointes" name="Render Attached Particles"/>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 746a4b1d55..0cdfc61e8e 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -494,6 +494,15 @@ Consulter [_URL] pour en savoir plus ?
 		</url>
 		<usetemplate ignoretext="Mon matériel n&apos;est pas pris en charge" name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		Il existe probablement un pilote plus récent pour votre puce graphique. La mise à jour des pilotes graphiques est susceptible d&apos;améliorer considérablement les performances.
+
+    Visiter la page [_URL] pour rechercher d&apos;éventuelles mises à jour de pilotes ?
+		<url name="url">
+			http://www.intel.com/p/fr_FR/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Votre système contient une carte graphique que [APP_NAME] ne reconnaît pas.
 Cela est souvent le cas avec le nouveau matériel qui n&apos;a pas encore été testé avec [APP_NAME].  Cela ne posera probablement pas de problème, mais vous devrez peut-être ajuster vos paramètres graphiques.
@@ -2614,16 +2623,12 @@ Acceptez-vous ?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Un objet nommé &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, appartenant à [NAME], aimerait :
-
-[QUESTIONS]
-Si vous n&apos;avez pas confiance en cet objet ni en son créateur, refusez cette requête.
-
-Accepter cette requête ?
+		Avertissement : l&apos;objet &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt; souhaite un accès total à votre compte en Linden dollars. Si vous autorisez cet accès, il pourra supprimer des fonds de votre compte à tout moment ou le vider entièrement de façon continue sans avis préalable.
+  
+Il est rare qu&apos;une telle demande soit légitime. N&apos;autorisez pas cet accès si vous ne comprenez pas entièrement pourquoi l&apos;objet souhaite accéder à votre compte.
 		<form name="form">
-			<button name="Grant" text="Accepter"/>
+			<button name="Grant" text="Permettre un accès total"/>
 			<button name="Deny" text="Refuser"/>
-			<button name="Details" text="Détails..."/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
@@ -3122,4 +3127,15 @@ Sinon, consultez la carte et trouvez les &quot; infohubs &quot;.
 	<global name="You died and have been teleported to your home location">
 		Vous êtes mort et avez été téléporté à votre domicile.
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		Impossible de mettre à jour [FNAME] car le fichier est introuvable.
+Désactivation des mises à jour futures de ce fichier...
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[NRETRIES] tentatives d&apos;ouverture ou de décodage de [FNAME] ont échoué. Le fichier est désormais considéré comme endommagé.
+Désactivation des mises à jour futures de ce fichier...
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		Tentative d&apos;ajout d&apos;un fichier image [FNAME] non valide ou illisible n&apos;ayant pas pu être ouvert ou décodé. Tentative annulée.
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml b/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml
new file mode 100644
index 0000000000..a2d0237da0
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_script_question_toast.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 8b410128da..0987952c28 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -886,6 +886,9 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="ScriptQuestionCautionChatDenied">
 		&apos;[OBJECTNAME]&apos;, un objet appartenant à [OWNERNAME], situé dans [REGIONNAME] à [REGIONPOS], n&apos;a pas reçu le droit de : [PERMISSIONS].
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		Si vous autorisez un accès à votre compte, vous autorisez également l&apos;objet à :
+	</string>
 	<string name="ScriptTakeMoney">
 		Débiter vos Linden dollars (L$)
 	</string>
@@ -919,6 +922,9 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="ControlYourCamera">
 		Contrôler votre caméra
 	</string>
+	<string name="TeleportYourAgent">
+		Vous téléporter
+	</string>
 	<string name="NotConnected">
 		Pas connecté(e)
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
index 5d3ae04a4d..edbbc354cf 100644
--- a/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/it/floater_hardware_settings.xml
@@ -25,6 +25,10 @@
 		Attiva VBO:
 	</text>
 	<check_box initial_value="true" label="Attiva oggetti OpenGL Vertex Buffer" name="vbo" tool_tip="Attivandolo su un hardware moderno aumenta la performance.  Ma, su un vecchio hardware, spesso l&apos;implementazione dei VBO è scarsa e potresti avere dei crash quando è attivato."/>
+	<text name="tc label">
+		Attiva S3TC:
+	</text>
+	<check_box initial_value="true" label="Attiva compressione texture (richiede riavvio)" name="texture compression" tool_tip="Comprime le texture nella memoria video, consentendo il caricamento di texture a risoluzione maggiore al prezzo di ua perdita di qualit&apos; del colore."/>
 	<slider label="Memoria texture (MB):" name="GraphicsCardTextureMemory" tool_tip="Spazio di memoria da ssegnare alle textures. Utilizza la memoria della scheda video come impostazione predefinita. La riduzione di questa impostazione potrebbe migliorare il rendimento ma potrebbe anche rendere le texture poco definite."/>
 	<spinner label="Indice della distanza  della nebbia:" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>
diff --git a/indra/newview/skins/default/xui/it/floater_stats.xml b/indra/newview/skins/default/xui/it/floater_stats.xml
index ad6ef6b54b..2241cad711 100644
--- a/indra/newview/skins/default/xui/it/floater_stats.xml
+++ b/indra/newview/skins/default/xui/it/floater_stats.xml
@@ -14,8 +14,11 @@
 					<stat_bar label="KTris disegnato per secondo" name="ktrissec"/>
 					<stat_bar label="Totale oggetti" name="objs"/>
 					<stat_bar label="Nuovi oggetti" name="newobjs"/>
+					<stat_bar label="Hit rate della cache per l&apos;oggetto" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="Texture" name="texture">
+					<stat_bar label="Hit rate della cache" name="texture_cache_hits"/>
+					<stat_bar label="Latenza di lettura della cache" name="texture_cache_read_latency"/>
 					<stat_bar label="Conteggio" name="numimagesstat"/>
 					<stat_bar label="Conteggio grezzo" name="numrawimagesstat"/>
 					<stat_bar label="Memoria GL" name="gltexmemstat"/>
diff --git a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
index 7b77584ba0..e85030087c 100644
--- a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
@@ -1,23 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="PREFERITO: TEXTURE">
-	<string name="choose_picture">
+	<floater.string name="choose_picture">
 		Clicca per scegliere l&apos;immagine
-	</string>
+	</floater.string>
+	<floater.string name="pick title">
+		Scegli:
+	</floater.string>
 	<text name="Multiple">
 		Texture multiple
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="Inventario" name="inventory" value="0"/>
+		<radio_item label="Locale" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		Dimensioni: [DIMENSIONS]
 	</text>
 	<button label="Default" label_selected="Default" name="Default"/>
-	<button label="Niente" label_selected="Niente" name="None"/>
 	<button label="Vuoto" label_selected="Vuoto" name="Blank"/>
-	<check_box label="Mostra cartelle" name="show_folders_check"/>
-	<search_editor label="Filtro texture" name="inventory search editor"/>
-	<check_box label="Applica adesso" name="apply_immediate_check"/>
-	<button label="Annulla" label_selected="Annulla" name="Cancel"/>
+	<button label="Niente" label_selected="Niente" name="None"/>
+	<filter_editor label="Filtro texture" name="inventory search editor"/>
+	<check_box initial_value="false" label="Mostra cartelle" name="show_folders_check"/>
+	<button label="Aggiungi" label_selected="Aggiungi" name="l_add_btn"/>
+	<button label="Rimuovi" label_selected="Rimuovi" name="l_rem_btn"/>
+	<button label="Carica" label_selected="Carica" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="Nome" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
 	<button label="OK" label_selected="OK" name="Select"/>
-	<string name="pick title">
-		Scegli:
-	</string>
+	<button label="Annulla" label_selected="Annulla" name="Cancel"/>
+	<check_box initial_value="true" label="Applica adesso" name="apply_immediate_check"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml
new file mode 100644
index 0000000000..57e65c3456
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="Debugger recupero texture">
+	<text name="total_num_fetched_label">
+		1, Numero totale di texture recuperate: [NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, Numero totale di richieste di recupero: [NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, Numero totale di recuperi dalla cache: [NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, Numero totale di texture visibili: [NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, Numero totale di richieste di fetching texture visibili: [NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, Numero totale di fetching dati: [SIZE1] KB, Dati decodificati: [SIZE2] KB, [PIXEL] MPixel
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, Numero totale di dati visibili: [SIZE1] KB, Dati decodificati: [SIZE2] KB
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, Numero totale di rendering dei dati: [SIZE1] KB, Dati decodificati: [SIZE2] KB, [PIXEL] MPixel
+	</text>
+	<text name="total_time_cache_read_label">
+		9, Tempo totale letture cache: [TIME] secondi
+	</text>
+	<text name="total_time_cache_write_label">
+		10, Tempo totale scrittura cache: [TIME] secondi
+	</text>
+	<text name="total_time_decode_label">
+		11, Tempo totale decodifica: [TIME] secondi
+	</text>
+	<text name="total_time_gl_label">
+		12, Tempo totale creazione texture gl: [TIME] secondi
+	</text>
+	<text name="total_time_http_label">
+		13, Tempo totale fetching HTTP: [TIME] secondi
+	</text>
+	<text name="total_time_fetch_label">
+		14, Tempo totale complessivo fetching: [TIME] secondi
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, Nuovo fetching elementi visibili dalla cache, Tempo: [TIME] secondi, fetching: [SIZE] KB, [PIXEL] MPixels
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		16, Nuovo fetching elementi visibili da HTTP, Tempo: [TIME] secondi, fetching: [SIZE] KB, [PIXEL] MPixels
+	</text>
+	<spinner label="17, Rapporto Texel/Pixel:" name="texel_pixel_ratio"/>
+	<button label="Attiva" name="start_btn"/>
+	<button label="Reimposta" name="clear_btn"/>
+	<button label="Chiudi" name="close_btn"/>
+	<button label="Lettura cache" name="cacheread_btn"/>
+	<button label="Scrittura cache" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="Decodifica" name="decode_btn"/>
+	<button label="Texture GL" name="gl_btn"/>
+	<button label="Nuovo fetch visibili cache" name="refetchviscache_btn"/>
+	<button label="Nuovo fetch visibili HTTP" name="refetchvishttp_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_window_size.xml b/indra/newview/skins/default/xui/it/floater_window_size.xml
index 036b74b7d9..fef423aefe 100644
--- a/indra/newview/skins/default/xui/it/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/it/floater_window_size.xml
@@ -7,10 +7,17 @@
 		Imposta dimensione finestra:
 	</text>
 	<combo_box name="window_size_combo" tool_tip="larghezza x altezza">
-		<combo_box.item label="1000 x 700 (default)" name="item0"/>
-		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 (720p)" name="item2"/>
-		<combo_box.item label="1920 x 1080 (1080p)" name="item3"/>
+		<combo_box.item label="1000 x 700 (predefinito)" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
 	</combo_box>
 	<button label="Imposta" name="set_btn"/>
 	<button label="Annulla" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index 99b7e3c4e6..f94b2f9a9e 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -226,11 +226,10 @@
 			<menu_item_check label="Console texture" name="Texture Console"/>
 			<menu_item_check label="Console di Debug" name="Debug Console"/>
 			<menu_item_call label="Console notifiche" name="Notifications"/>
-			<menu_item_check label="Console dimensioni texture" name="Texture Size"/>
-			<menu_item_check label="Console categoria texture" name="Texture Category"/>
 			<menu_item_check label="Timer veloci" name="Fast Timers"/>
 			<menu_item_check label="Memoria" name="Memory"/>
 			<menu_item_check label="Statistiche scena" name="Scene Statistics"/>
+			<menu_item_call label="Console di debug recupero texture" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="Informazioni regione sulla console di debug" name="Region Info to Debug Console"/>
 			<menu_item_check label="Fotocamera" name="Camera"/>
 			<menu_item_check label="Vento" name="Wind"/>
@@ -271,6 +270,12 @@
 			<menu_item_check label="Complessità rendering" name="rendercomplexity"/>
 			<menu_item_check label="Byte collegamento" name="attachment bytes"/>
 			<menu_item_check label="Scolpisci" name="Sculpt"/>
+			<menu label="Densità texture" name="Texture Density">
+				<menu_item_check label="Nessuna" name="None"/>
+				<menu_item_check label="Attuale" name="Current"/>
+				<menu_item_check label="Desiderata" name="Desired"/>
+				<menu_item_check label="Completa" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Assi" name="Axes"/>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 0e6fee60d1..9660c8f851 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -492,6 +492,15 @@ Visitare [_URL] per ulteriori informazioni?
 		</url>
 		<usetemplate ignoretext="L&apos;hardware di questo computer non è compatibile" name="okcancelignore" notext="No" yestext="Si"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		È probabile che ci sia un driver aggiornato per il processore grafico.  L&apos;aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa.
+
+    Visitare [_URL] per cercare un aggiornamento del driver?
+		<url name="url">
+			http://www.intel.com/p/it_IT/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Il tuo sistema utilizza una scheda grafica che [APP_NAME] non riconosce.
 Questo succede spesso con un nuovo hardware che non è stato ancora testato con [APP_NAME].  Probabilmente tutto andrà bene, ma devi riconfigurare le tue impostazioni grafiche.
@@ -2616,16 +2625,12 @@ OK?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Un oggetto di nome &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, posseduto da  &apos;[NAME]&apos; vorrebbe:
-
-[QUESTIONS]
-Se non ti fidi di questo oggetto e del suo ideatore, dovresti rifiutare la richiesta.
-
-Concedi questa richiesta?
+		Attenzione: L&apos;oggetto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; ha richiesto accesso completo al tuo account in Dollari Linden. Se consenti l&apos;accesso, potrà rimuovere fondi dal tuo account in qalunque momento e anche svuotare completamente l&apos;account, per un periodo illimitato e senza ulteriori avvisi.
+  
+Raramente questo tipo di richiesta è legittima. Non consentire l&apos;accesso se non comprendi perfettamente il motivo per cui desidera accedere al tuo account.
 		<form name="form">
-			<button name="Grant" text="Accetta"/>
+			<button name="Grant" text="Consenti accesso totale"/>
 			<button name="Deny" text="Nega"/>
-			<button name="Details" text="Dettagli..."/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
@@ -3124,4 +3129,16 @@ In alternativa, puoi guardare sulla mappa e trovare luoghi segnalati come &quot;
 	<global name="You died and have been teleported to your home location">
 		Sei deceduto e sei stato teleportato a casa tua.
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		[FNAME] non è stato aggiornato perché il file non è stato più trovato.
+Gli aggiornamenti futuri per questo file sono disattivati.
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[FNAME] non è stato aperto o decodificato dopo [NRETRIES] tentativi, viene considerato danneggiato.
+Gli aggiornamenti futuri per questo file sono disattivati.
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		Tentativo di aggiungere un file immagine [FNAME] non valido o non leggibile che non è stato possibile aprire o decodificare.
+Tentativo annullato.
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/it/panel_script_question_toast.xml b/indra/newview/skins/default/xui/it/panel_script_question_toast.xml
new file mode 100644
index 0000000000..a2d0237da0
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_script_question_toast.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 8529fadd7d..11accb5f08 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -880,6 +880,9 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="ScriptQuestionCautionChatDenied">
 		A &apos;[OBJECTNAME]&apos;, un oggetto di proprietà di &apos;[OWNERNAME]&apos;, situato in [REGIONNAME] [REGIONPOS], è stato negato il permesso di: [PERMISSIONS].
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		Se consenti l&apos;accesso al tuo account, consentirai anche all&apos;oggetto di:
+	</string>
 	<string name="ScriptTakeMoney">
 		Prendere dollari Linden (L$) da te
 	</string>
@@ -913,6 +916,9 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="ControlYourCamera">
 		Controllare la tua fotocamera
 	</string>
+	<string name="TeleportYourAgent">
+		Teleportarti
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Generale
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
index 1b6558a9eb..c8b8e918e0 100644
--- a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
@@ -25,6 +25,10 @@
 		VBO を有効化：
 	</text>
 	<check_box initial_value="true" label="OpenGL Vertex Buffer Objectsを有効化" name="vbo" tool_tip="最新のハードウェアでこの設定を有効にすると、パフォーマンスが向上します。  しかし、旧型のハードウェアでは VBO の実装が貧弱な場合が多く、この設定を有効にすることでクラッシュにつながるおそれがあります。"/>
+	<text name="tc label">
+		S3TC を有効にする：
+	</text>
+	<check_box initial_value="true" label="テクスチャ圧縮を有効にする（再起動が必要）" name="texture compression" tool_tip="ビデオメモリ内でテクスチャを圧縮することにより、色の質を多少犠牲にしながら、より高解像度のテクスチャを読み込めるようにします。"/>
 	<slider label="テクスチャメモリ（MB）：" name="GraphicsCardTextureMemory" tool_tip="テクスチャに割り当てられたメモリの量。 ビデオカードのメモリに既定。 数値を下げるとパフォーマンスが向上しますが、テクスチャの精度が落ちることがあります。"/>
 	<spinner label="フォグの距離比率：" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_stats.xml b/indra/newview/skins/default/xui/ja/floater_stats.xml
index 6a1f34cfd8..da5358f06a 100644
--- a/indra/newview/skins/default/xui/ja/floater_stats.xml
+++ b/indra/newview/skins/default/xui/ja/floater_stats.xml
@@ -14,8 +14,11 @@
 					<stat_bar label="秒ごとの KTris 描画" name="ktrissec"/>
 					<stat_bar label="オブジェクト合計" name="objs"/>
 					<stat_bar label="新規オブジェクト" name="newobjs"/>
+					<stat_bar label="オブジェクトキャッシュヒット率" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="テクスチャ" name="texture">
+					<stat_bar label="キャッシュヒット率" name="texture_cache_hits"/>
+					<stat_bar label="キャッシュ読み取り遅延" name="texture_cache_read_latency"/>
 					<stat_bar label="カウント" name="numimagesstat"/>
 					<stat_bar label="Raw カウント" name="numrawimagesstat"/>
 					<stat_bar label="GL メモリ" name="gltexmemstat"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
index 399cffcce5..55fe840658 100644
--- a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
@@ -1,24 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="テクスチャの選択">
-	<string name="choose_picture">
+	<floater.string name="choose_picture">
 		クリックして写真を選択
-	</string>
+	</floater.string>
+	<floater.string name="pick title">
+		ピック:
+	</floater.string>
 	<text name="Multiple">
 		複数のテクスチャ
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="インベントリ" name="inventory" value="0"/>
+		<radio_item label="ローカル" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		サイズ： [DIMENSIONS]
 	</text>
 	<button label="デフォルト" label_selected="デフォルト" name="Default"/>
-	<button label="なし" label_selected="なし" name="None"/>
 	<button label="ブランク" label_selected="ブランク" name="Blank"/>
-	<check_box label="フォルダを表示" name="show_folders_check"/>
-	<search_editor label="テクスチャをフィルター" name="inventory search editor"/>
-	<check_box label="すぐ適用" name="apply_immediate_check"/>
+	<button label="なし" label_selected="なし" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
+	<filter_editor label="テクスチャをフィルター" name="inventory search editor"/>
+	<check_box initial_value="false" label="フォルダを表示" name="show_folders_check"/>
+	<button label="追加" label_selected="追加" name="l_add_btn"/>
+	<button label="削除" label_selected="削除" name="l_rem_btn"/>
+	<button label="アップロード" label_selected="アップロード" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="名前" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
 	<button label="OK" label_selected="OK" name="Select"/>
-	<text name="pick title">
-		ピック:
-	</text>
+	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
+	<check_box initial_value="true" label="すぐ適用" name="apply_immediate_check"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
new file mode 100644
index 0000000000..4efdf7d40d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="テクスチャ取得デバッガ">
+	<text name="total_num_fetched_label">
+		1, 取得したテクスチャの合計数：[NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, 取得リクエストの合計数：[NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, キャッシュヒットの合計数：[NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, 表示テクスチャの合計数：[NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, 表示テクスチャ取得リクエストの合計数：[NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, 取得したデータの合計数：[SIZE1]KB、デコードされたデータ：[SIZE2]KB、[PIXEL]メガピクセル
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, 表示データの合計数：[SIZE1]KB、デコードされたデータ：[SIZE2]KB
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, レンダリングされたデータの合計数：[SIZE1]KB、デコードされたデータ：[SIZE2]KB、[PIXEL]メガピクセル
+	</text>
+	<text name="total_time_cache_read_label">
+		9, キャッシュ読み取りの合計時間：[TIME] 秒
+	</text>
+	<text name="total_time_cache_write_label">
+		10, キャッシュ書き込みの合計時間：[TIME] 秒
+	</text>
+	<text name="total_time_decode_label">
+		11, デコードの合計時間：[TIME] 秒
+	</text>
+	<text name="total_time_gl_label">
+		12, glテクスチャ作成の合計時間：[TIME] 秒
+	</text>
+	<text name="total_time_http_label">
+		13, HTTP 取得の合計時間：[TIME] 秒
+	</text>
+	<text name="total_time_fetch_label">
+		14, 取得全体の合計時間：[TIME] 秒
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, キャッシュから表示テクスチャを再取得、時間：[TIME] 秒、取得：[SIZE]KB、[PIXEL]メガピクセル
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		16, HTTP から表示テクスチャを再取得、時間：[TIME] 秒、取得：[SIZE]KB、[PIXEL]メガピクセル
+	</text>
+	<spinner label="17, テクセル／ピクセルの比率：" name="texel_pixel_ratio"/>
+	<button label="開始" name="start_btn"/>
+	<button label="リセット" name="clear_btn"/>
+	<button label="閉じる" name="close_btn"/>
+	<button label="キャッシュ読み取り" name="cacheread_btn"/>
+	<button label="キャッシュ書き込み" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="デコード" name="decode_btn"/>
+	<button label="GL テクスチャ" name="gl_btn"/>
+	<button label="キャッシュ表示テクスチャ再取得" name="refetchviscache_btn"/>
+	<button label="HTTP表示テクスチャ再取得" name="refetchvishttp_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_window_size.xml b/indra/newview/skins/default/xui/ja/floater_window_size.xml
index 152a5f4806..416813d6cc 100644
--- a/indra/newview/skins/default/xui/ja/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/ja/floater_window_size.xml
@@ -7,10 +7,17 @@
 		ウィンドウのサイズを設定：
 	</text>
 	<combo_box name="window_size_combo" tool_tip="横幅 x 高さ">
-		<combo_box.item label="1000 x 700 （標準）" name="item0"/>
-		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 （720p）" name="item2"/>
-		<combo_box.item label="1920 x 1080 （1080p）" name="item3"/>
+		<combo_box.item label="1000 x 700 （デフォルト）" name="item1"/>
+		<combo_box.item label="1024 x 768 （4:3 XGA）" name="item2"/>
+		<combo_box.item label="1280 x 720 （16:9 HDTV）" name="item3"/>
+		<combo_box.item label="1280 x 800 （5:8 WXGA）" name="item4"/>
+		<combo_box.item label="1280 x 1024 （5:4 SXGA）" name="item5"/>
+		<combo_box.item label="1440 x 900 （8:5 WSXGA）" name="item7"/>
+		<combo_box.item label="1600 x 900 （16:9 HD+）" name="item8"/>
+		<combo_box.item label="1600 x 1200 （4:3 UXGA）" name="item9"/>
+		<combo_box.item label="1680 x 1050 （8:5 WSXGA+）" name="item10"/>
+		<combo_box.item label="1920 x 1080 （16:9 HDTV）" name="item11"/>
+		<combo_box.item label="1920 x 1200 （8:5 WUXGA）" name="item12"/>
 	</combo_box>
 	<button label="設定" name="set_btn"/>
 	<button label="キャンセル" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 8496dfb1db..3a398bd985 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -227,11 +227,10 @@
 			<menu_item_check label="テクスチャのコンソール" name="Texture Console"/>
 			<menu_item_check label="デバッグコンソール" name="Debug Console"/>
 			<menu_item_call label="通知コンソール" name="Notifications"/>
-			<menu_item_check label="テクスチャサイズのコンソール" name="Texture Size"/>
-			<menu_item_check label="テクスチャカテゴリのコンソール" name="Texture Category"/>
 			<menu_item_check label="ファーストタイマー" name="Fast Timers"/>
 			<menu_item_check label="メモリ" name="Memory"/>
 			<menu_item_check label="風景の統計" name="Scene Statistics"/>
+			<menu_item_call label="テクスチャ取得デバッグコンソール" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="リージョン情報をデバッグコンソールへ" name="Region Info to Debug Console"/>
 			<menu_item_call label="グループ情報をデバッグコンソールへ" name="Group Info to Debug Console"/>
 			<menu_item_call label="性能情報をデバッグコンソールへ" name="Capabilities Info to Debug Console"/>
@@ -289,6 +288,12 @@
 			<menu_item_check label="描画の詳細度" name="rendercomplexity"/>
 			<menu_item_check label="添付アイテムのバイト数" name="attachment bytes"/>
 			<menu_item_check label="スカルプト" name="Sculpt"/>
+			<menu label="テクスチャの密度" name="Texture Density">
+				<menu_item_check label="なし" name="None"/>
+				<menu_item_check label="現在" name="Current"/>
+				<menu_item_check label="望ましい" name="Desired"/>
+				<menu_item_check label="フル" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="レンダリング" name="Rendering">
 			<menu_item_check label="軸" name="Axes"/>
@@ -306,7 +311,6 @@
 			<menu_item_check label="アニメーションテクスチャ" name="Animation Textures"/>
 			<menu_item_check label="テクスチャを無効にする" name="Disable Textures"/>
 			<menu_item_check label="フル解像度テクスチャ" name="Rull Res Textures"/>
-			<menu_item_check label="テクスチャの検査" name="Audit Textures"/>
 			<menu_item_check label="テクスチャアトラス（試験段階）" name="Texture Atlas"/>
 			<menu_item_check label="装着された光源を描画する" name="Render Attached Lights"/>
 			<menu_item_check label="取り付けられたパーティクルを描画する" name="Render Attached Particles"/>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 7bf8a7b8be..db7ed5f57c 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -517,6 +517,15 @@ L$ が不足しているのでこのグループに参加することができ
 		</url>
 		<usetemplate ignoretext="使用中のコンピューターのハードウェアがサポートされていないとき" name="okcancelignore" notext="いいえ" yestext="はい"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		おそらくお使いのグラフィックチップ用の新しいドライバが入手可能です。グラフィックドライバを更新することにより、パフォーマンスが大幅に向上する場合があります。
+
+[_URL] にアクセスして更新版のドライバがあるかどうかを確認しますか？
+		<url name="url">
+			http://www.intel.com/p/ja_JP/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="使用しているグラフィックドライバが古い場合" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
 	<notification name="UnknownGPU">
 		お使いのシステムには、[APP_NAME] が認識できないグラフィックカードが搭載されています。
 [APP_NAME] でまだテストされていない最新ハードウェアのためだと考えられます。  問題ないとは思いますが、グラフィックの設定を調整する必要があるかもしれません。
@@ -2663,16 +2672,12 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		[NAME] が所有する「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」 というオブジェクトが、次のことをしようとしています：
-
-[QUESTIONS]
-このオブジェクトや制作者を信用できない場合は、このリクエストを拒否してください。
-
-リクエストを受けますか？
+		警告：オブジェクト &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; はあなたのリンデンドルアカウントへのトータルアクセスを希望しています。アクセスを許可すると、このオブジェクトはいつでもあなたのアカウントから資金を削除したり、今後警告を表示することなく継続的にアカウントを完全に空にできるようになります。
+  
+このようなリクエストが正当であることは稀です。このオブジェクトがあなたのアカウントにアクセスしたい理由を完全に理解している場合を除き、アクセスの許可は避けてください。
 		<form name="form">
-			<button name="Grant" text="許可"/>
+			<button name="Grant" text="トータルアクセスを許可"/>
 			<button name="Deny" text="拒否"/>
-			<button name="Details" text="詳細..."/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
@@ -2892,18 +2897,6 @@ M キーを押して変更します。
 
 次の住人と共有：
 
-[RESIDENTS]
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="Ok"/>
-	</notification>
-	<notification name="ShareFolderConfirmation">
-		フォルダは一度に 1 つしか共有できません。
-
-次のアイテムを共有しますか？
-
-&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
-
-次の住人と共有：
-
 [RESIDENTS]
 		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="Ok"/>
 	</notification>
@@ -3180,4 +3173,16 @@ M キーを押して変更します。
 	<global name="You died and have been teleported to your home location">
 		死んでしまったので、ホームにテレポートされました。
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		[FNAME] は、見つからなかったため、更新できませんでした。
+このファイルに対する今後の更新を無効にします。
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[FNAME] を開くまたはデコードする試行に失敗しました（試行回数 [NRETRIES] 回）。そのため、このファイルは壊れているものとして処理されました。
+このファイルに対する今後の更新を無効にします。
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		開くことができない、またはデコードできない無効または読み取り不能な画像ファイル [FNAME] を追加しようとしました。
+この試行はキャンセルされました。
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml b/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml
new file mode 100644
index 0000000000..a2d0237da0
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_script_question_toast.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 680ef60890..f6b3edc57f 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -886,6 +886,9 @@ support@secondlife.com にお問い合わせください。
 	<string name="ScriptQuestionCautionChatDenied">
 		[REGIONNAME] の [REGIONPOS] という場所にある、「 [OWNERNAME] 」が所有する「 [OBJECTNAME] 」というオブジェクトは、次の権限を拒否しました： [PERMISSIONS]
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		あなたのアカウントへのアクセスを許可すると、このオブジェクトには次の操作も許可されます：
+	</string>
 	<string name="ScriptTakeMoney">
 		リンデンドル（L$）を支払う
 	</string>
@@ -919,6 +922,9 @@ support@secondlife.com にお問い合わせください。
 	<string name="ControlYourCamera">
 		カメラのコントロール
 	</string>
+	<string name="TeleportYourAgent">
+		あなたをテレポート
+	</string>
 	<string name="NotConnected">
 		接続されていません
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
index 1bc2bce768..1204fb93e2 100644
--- a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
@@ -25,6 +25,10 @@
 		Habilitar VBO:
 	</text>
 	<check_box initial_value="true" label="Habilitar Objetos com Armazenamento de Vértices" name="vbo" tool_tip="Habilitando-o em máquinas novas, ele oferece um ganho de performance. Contudo, as máquinas antigas tem freqüentemente implementações pobres de VBOs e você pode ter travamentos quando esta opção é habilitada."/>
+	<text name="tc label">
+		Habilitar S3TC:
+	</text>
+	<check_box initial_value="true" label="Habilitar compressão de texturas (requer reinício)" name="texture compression" tool_tip="Comprime as texturas na memória de vídeo, permitindo o carregamento de texturas de maior resolução em detrimento da qualidade da cor."/>
 	<slider label="Memória de texturas (MB):" name="GraphicsCardTextureMemory" tool_tip="Quanto da memória deve ser alocado para texturas.  O padrão é definido pela memória da placa de vídeo.  Reduzir este valor pode melhorar o desempenho, mas as texturas podem fica fora de foco."/>
 	<spinner label="Relação de Distância de  Nevoeiro:" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_stats.xml b/indra/newview/skins/default/xui/pt/floater_stats.xml
index f0a053ebe3..e770c6ac38 100644
--- a/indra/newview/skins/default/xui/pt/floater_stats.xml
+++ b/indra/newview/skins/default/xui/pt/floater_stats.xml
@@ -14,8 +14,11 @@
 					<stat_bar label="KTris desenhados por segundo" name="ktrissec"/>
 					<stat_bar label="Total Objects" name="objs"/>
 					<stat_bar label="New Objects" name="newobjs"/>
+					<stat_bar label="Taxa de acertos do cache do objeto" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="Texture" name="texture">
+					<stat_bar label="Taxa de acertos do cache" name="texture_cache_hits"/>
+					<stat_bar label="Latência de leitura do cache" name="texture_cache_read_latency"/>
 					<stat_bar label="Count" name="numimagesstat"/>
 					<stat_bar label="Raw Count" name="numrawimagesstat"/>
 					<stat_bar label="GL Mem" name="gltexmemstat"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
index 144bc0340e..57223beaeb 100644
--- a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
@@ -1,23 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="DESTAQUE: TEXTURA">
-	<string name="choose_picture">
+	<floater.string name="choose_picture">
 		Clique para escolher uma imagem
-	</string>
+	</floater.string>
+	<floater.string name="pick title">
+		Pegar:
+	</floater.string>
 	<text name="Multiple">
 		Multiplas texturas
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="Inventário" name="inventory" value="0"/>
+		<radio_item label="Local" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		Tamanho: [DIMENSÕES]
 	</text>
 	<button label="Padrão" label_selected="Padrão" name="Default"/>
-	<button label="Nenhum" label_selected="Nenhum" name="None"/>
 	<button label="Branco" label_selected="Branco" name="Blank"/>
-	<check_box label="Exibir pastas" name="show_folders_check"/>
-	<search_editor label="Filtrar texturas" name="inventory search editor"/>
-	<check_box label="Applicar agora" name="apply_immediate_check"/>
-	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<button label="Nenhum" label_selected="Nenhum" name="None"/>
+	<filter_editor label="Filtrar texturas" name="inventory search editor"/>
+	<check_box initial_value="false" label="Exibir pastas" name="show_folders_check"/>
+	<button label="Adicionar" label_selected="Adicionar" name="l_add_btn"/>
+	<button label="Remover" label_selected="Remover" name="l_rem_btn"/>
+	<button label="Enviar" label_selected="Enviar" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="Nome" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
 	<button label="OK" label_selected="OK" name="Select"/>
-	<string name="pick title">
-		Pegar:
-	</string>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<check_box initial_value="true" label="Applicar agora" name="apply_immediate_check"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml
new file mode 100644
index 0000000000..f20d50362e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="Depurador de obtenção de textura">
+	<text name="total_num_fetched_label">
+		1, Número total de texturas obtidas: [NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, Número total de solicitações de obtenção: [NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, Número total de acertos de cache: [NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, Número total de texturas visíveis: [NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, Número total de solicitações de obtenção de texturas visíveis: [NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, Número total de dados obtidos: [SIZE1]KB, Dados decodificados: [SIZE2]KB, [PIXEL]MPixels
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, Número total de dados visíveis: [SIZE1]KB, Dados decodificados: [SIZE2]KB
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, Número total de dados renderizados: [SIZE1]KB, Dados decodificados: [SIZE2]KB, [PIXEL]MPixels
+	</text>
+	<text name="total_time_cache_read_label">
+		9, Tempo total de leituras de cache: [TIME] segundos
+	</text>
+	<text name="total_time_cache_write_label">
+		10, Tempo total de gravações em cache: [TIME] segundos
+	</text>
+	<text name="total_time_decode_label">
+		11, Tempo total das decodificações: [TIME] segundos
+	</text>
+	<text name="total_time_gl_label">
+		12, Tempo total de criação de texturas gl: [TIME] segundos
+	</text>
+	<text name="total_time_http_label">
+		13, Tempo total de obtenção de HTTP: [TIME] segundos
+	</text>
+	<text name="total_time_fetch_label">
+		14, Tempo total de obtenção completa: [TIME] segundos
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, Obtendo novamente visíveis do cache, Tempo: [TIME] segundos, Obtidos: [SIZE]KB, [PIXEL]MPixels
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		16, Obtendo novamente visíveis do HTTP, Tempo: [TIME] segundos, Obtidos: [SIZE]KB, [PIXEL]MPixels
+	</text>
+	<spinner label="17, Proporção de texel/pixel:" name="texel_pixel_ratio"/>
+	<button label="Iniciar" name="start_btn"/>
+	<button label="Redefinir" name="clear_btn"/>
+	<button label="Fechar" name="close_btn"/>
+	<button label="Leitura do cache" name="cacheread_btn"/>
+	<button label="Gravação em cache" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="Decodificar" name="decode_btn"/>
+	<button label="Textura GL" name="gl_btn"/>
+	<button label="Obter novamente cache visível" name="refetchviscache_btn"/>
+	<button label="Obter novamente HTTP visível" name="refetchvishttp_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_window_size.xml b/indra/newview/skins/default/xui/pt/floater_window_size.xml
index 6a8ccbd002..7deb799bd7 100644
--- a/indra/newview/skins/default/xui/pt/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/pt/floater_window_size.xml
@@ -7,10 +7,17 @@
 		Definir tamanho da janela:
 	</text>
 	<combo_box name="window_size_combo" tool_tip="largura x altura">
-		<combo_box.item label="1000 x 700 (padrão)" name="item0"/>
-		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 (720p)" name="item2"/>
-		<combo_box.item label="1920 x 1080 (1080p)" name="item3"/>
+		<combo_box.item label="1000 x 700 (padrão)" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
 	</combo_box>
 	<button label="Definir" name="set_btn"/>
 	<button label="Cancelar" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index fd973bf3c2..d93330e6df 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -226,11 +226,10 @@
 			<menu_item_check label="Painel de textura" name="Texture Console"/>
 			<menu_item_check label="Console de depuração" name="Debug Console"/>
 			<menu_item_call label="Painel de avisos" name="Notifications"/>
-			<menu_item_check label="Painel de tamanho de textura" name="Texture Size"/>
-			<menu_item_check label="Painel de texturas" name="Texture Category"/>
 			<menu_item_check label="Tempos" name="Fast Timers"/>
 			<menu_item_check label="Memória" name="Memory"/>
 			<menu_item_check label="Estatísticas da cena" name="Scene Statistics"/>
+			<menu_item_call label="Painel de depuração de obtenção de textura" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="Region Info to Debug Console" name="Region Info to Debug Console"/>
 			<menu_item_check label="Câmera:" name="Camera"/>
 			<menu_item_check label="Vento" name="Wind"/>
@@ -271,6 +270,12 @@
 			<menu_item_check label="Renderizar complexidade" name="rendercomplexity"/>
 			<menu_item_check label="Bytes do anexo" name="attachment bytes"/>
 			<menu_item_check label="Esculpir" name="Sculpt"/>
+			<menu label="Densidade da textura" name="Texture Density">
+				<menu_item_check label="Nenhuma" name="None"/>
+				<menu_item_check label="Atual" name="Current"/>
+				<menu_item_check label="Desejada" name="Desired"/>
+				<menu_item_check label="Completa" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Axes" name="Axes"/>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 3b39c0f92c..500a7f0c01 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -489,6 +489,15 @@ Consultar [_URL] para mais informações?
 		</url>
 		<usetemplate ignoretext="O hardware do meu computador não é suportado" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		Provavelmente, há um driver mais recente para o seu chip gráfico.  A atualização dos drivers gráficos pode melhorar significativamente o desempenho.
+
+    Visitar [_URL] para verificar se há atualizações do driver?
+		<url name="url">
+			http://www.intel.com/p/pt_BR/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
+	</notification>
 	<notification name="UnknownGPU">
 		A placa de vídeo do seu sistema não é reconhecida pelo [APP_NAME].
 Isto acontece quando novos hardwares que ainda não foram testados no [APP_NAME].  Talvez isso não cause problemas, mas pode ser preciso checar as configurações de vídeo. 
@@ -2596,16 +2605,12 @@ OK?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Um objeto chamado &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;&apos;, de &apos;[NAME]&apos;, gostaria de:
-
-[QUESTIONS]
-Se você não confia nos objetos deste autor, recuse-o.
-
-Deseja aceitar?
+		Aviso: O objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; deseja obter acesso total à sua conta de dólares Linden. Se você conceder acesso, ele poderá remover fundos de sua conta a qualquer momento ou esvaziar sua conta completamente, continuamente e sem avisos adicionais.
+  
+Esse tipo de pedido raramente é legítimo. Não conceda acesso se você não entender completamente por que ele deseja acessar sua conta.
 		<form name="form">
-			<button name="Grant" text="Autorizar"/>
+			<button name="Grant" text="Permitir acesso total"/>
 			<button name="Deny" text="Negar"/>
-			<button name="Details" text="Detalhes..."/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
@@ -3096,4 +3101,16 @@ Outra opção é procurar por lugares com a tag &apos;Infohub&apos; no mapa.
 	<global name="You died and have been teleported to your home location">
 		Você morreu e foi reenviado ao seu início.
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		Não foi possível atualizar [FNAME], pois o arquivo não pôde ser encontrado.
+Desabilitando atualizações futuras deste arquivo.
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[FNAME] não pode ser aberto ou decodificado em [NRETRIES] tentativas, e agora é considerado corrompido.
+Desabilitando atualizações futuras deste arquivo.
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		Tentativa de adição de um formato de imagem inválido ou ilegível [FNAME] que não pode ser aberto ou decodificado.
+Tentativa cancelada.
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml b/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml
new file mode 100644
index 0000000000..a2d0237da0
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_script_question_toast.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 342a52356b..fd8f22f331 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -835,6 +835,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="ScriptQuestionCautionChatDenied">
 		&apos;[OBJECTNAME]&apos;, um objeto de  &apos;[OWNERNAME]&apos;, localizado em [REGIONNAME] a [REGIONPOS], teve permissão negada para: [PERMISSIONS].
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		Se você permitir acesso à sua conta, o objeto também poderá:
+	</string>
 	<string name="ScriptTakeMoney">
 		Tomar linden dólares (L$) de você
 	</string>
@@ -868,6 +871,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="ControlYourCamera">
 		Controle sua camera
 	</string>
+	<string name="TeleportYourAgent">
+		Teletransportá-lo
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Público geral
 	</string>
diff --git a/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml
index 7400f1df3b..43f8c36473 100644
--- a/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/ru/floater_hardware_settings.xml
@@ -25,6 +25,10 @@
 		Включить VBO:
 	</text>
 	<check_box initial_value="истина" label="Включить объекты вершинных буферов OpenGL" name="vbo" tool_tip="Включение этого параметра на современном оборудовании даст увеличение производительности.  Однако на старом оборудовании это может привести к сбою приложения."/>
+	<text name="tc label">
+		Включить S3TC:
+	</text>
+	<check_box initial_value="true" label="Разрешить сжатие текстур (требует перезагрузки)" name="texture compression" tool_tip="Сжатие текстур в видеопамяти, что позволяет загружать текстуры большего размера за счет некоторого падения качества цвета."/>
 	<slider label="Память для текстур (Мб):" name="GraphicsCardTextureMemory" tool_tip="Количество памяти, отводимое для текстур. По умолчанию равно памяти видеокарты. Уменьшение поможет увеличить производительность, но текстуры могут стать размытыми."/>
 	<spinner label="Дистанция тумана:" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_stats.xml b/indra/newview/skins/default/xui/ru/floater_stats.xml
index b1f60c8029..2243c0f385 100644
--- a/indra/newview/skins/default/xui/ru/floater_stats.xml
+++ b/indra/newview/skins/default/xui/ru/floater_stats.xml
@@ -14,8 +14,11 @@
 					<stat_bar label="Треугольников в секунду" name="ktrissec"/>
 					<stat_bar label="Всего объектов" name="objs"/>
 					<stat_bar label="Новых объектов" name="newobjs"/>
+					<stat_bar label="Частота попаданий в кэш объектов" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="Текстура" name="texture">
+					<stat_bar label="Частота попаданий в кэш" name="texture_cache_hits"/>
+					<stat_bar label="Задержка чтения кэша" name="texture_cache_read_latency"/>
 					<stat_bar label="Количество" name="numimagesstat"/>
 					<stat_bar label="Необраб. изображений" name="numrawimagesstat"/>
 					<stat_bar label="Память GL" name="gltexmemstat"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
index d55daea836..f8693b8359 100644
--- a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
@@ -9,15 +9,26 @@
 	<text name="Multiple">
 		Несколько текстур
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="Инвентарь" name="inventory" value="0"/>
+		<radio_item label="Локально" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		Размер: [DIMENSIONS]
 	</text>
 	<button label="По умолчанию" label_selected="По умолчанию" name="Default"/>
-	<button label="Нет" label_selected="Нет" name="None"/>
 	<button label="Очистить" label_selected="Очистить" name="Blank"/>
-	<check_box initial_value="истина" label="Применить сейчас" name="apply_immediate_check"/>
+	<button label="Нет" label_selected="Нет" name="None"/>
 	<filter_editor label="Фильтровать текстуры" name="inventory search editor"/>
 	<check_box initial_value="ложь" label="Показывать папки" name="show_folders_check"/>
+	<button label="Добавить" label_selected="Добавить" name="l_add_btn"/>
+	<button label="Удалить" label_selected="Удалить" name="l_rem_btn"/>
+	<button label="Передать" label_selected="Передать" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="Имя" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
 	<button label="ОК" label_selected="ОК" name="Select"/>
 	<button label="Отмена" label_selected="Отмена" name="Cancel"/>
+	<check_box initial_value="истина" label="Применить сейчас" name="apply_immediate_check"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml
new file mode 100644
index 0000000000..034106f24c
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_texture_fetch_debugger.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="Отладчик извлечения текстур">
+	<text name="total_num_fetched_label">
+		1, Общее количество извлеченных текстур: [NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, Общее количество запросов на извлечение: [NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, Общее количество попаданий в кэш: [NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, Общее количество видимых текстур: [NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, Общее количество запросов на извлечение видимых текстур: [NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, Общий объем извлеченных данных: [SIZE1] КБ, декодированные данные: [SIZE2] КБ, [PIXEL] Мпикселов
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, Общий объем видимых данных: [SIZE1] КБ, декодированные данные: [SIZE2] КБ
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, Общий объем визуализированных данных: [SIZE1] КБ, декодированные данные: [SIZE2] КБ, [PIXEL] Мпикселов
+	</text>
+	<text name="total_time_cache_read_label">
+		9, Общее время чтения из кэша: [TIME] с
+	</text>
+	<text name="total_time_cache_write_label">
+		10, Общее время записи в кэш: [TIME] с
+	</text>
+	<text name="total_time_decode_label">
+		11, Общее время декодирования: [TIME] с
+	</text>
+	<text name="total_time_gl_label">
+		12, Общее время создания текстур: [TIME] с
+	</text>
+	<text name="total_time_http_label">
+		13, Общее время HTTP-извлечения: [TIME] с
+	</text>
+	<text name="total_time_fetch_label">
+		14, Общее время полного извлечения: [TIME] с
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, Повторное извлечение из кэша, время: [TIME] с, извлечено: [SIZE] КБ, [PIXEL] Мпикселов
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		16, Повторное извлечение из HTTP, время: [TIME] с, извлечено: [SIZE] КБ, [PIXEL] Мпикселов
+	</text>
+	<spinner label="17, Отношение текселы/пикселы" name="texel_pixel_ratio"/>
+	<button label="Пуск" name="start_btn"/>
+	<button label="Сброс" name="clear_btn"/>
+	<button label="Закрыть" name="close_btn"/>
+	<button label="Чтение кэша" name="cacheread_btn"/>
+	<button label="Запись в кэш" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="Декодировать" name="decode_btn"/>
+	<button label="Текстура GL" name="gl_btn"/>
+	<button label="Повторно извлечь из кэша" name="refetchviscache_btn"/>
+	<button label="Повторно извлечь из HTTP" name="refetchvishttp_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_window_size.xml b/indra/newview/skins/default/xui/ru/floater_window_size.xml
index 24865a6ba5..fbff6a72b2 100644
--- a/indra/newview/skins/default/xui/ru/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/ru/floater_window_size.xml
@@ -7,10 +7,17 @@
 		Задать размер окна:
 	</text>
 	<combo_box name="window_size_combo" tool_tip="ширина x высота">
-		<combo_box.item label="1000 x 700 (по умолчанию)" name="item0"/>
-		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 (720p)" name="item2"/>
-		<combo_box.item label="1920 x 1080 (1080p)" name="item3"/>
+		<combo_box.item label="1000 x 700 (по умолчанию)" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 WXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 UXGA)" name="item12"/>
 	</combo_box>
 	<button label="Задать" name="set_btn"/>
 	<button label="Отмена" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index 0699314d97..701f097ddb 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -225,11 +225,10 @@
 			<menu_item_check label="Консоль текстур" name="Texture Console"/>
 			<menu_item_check label="Консоль отладки" name="Debug Console"/>
 			<menu_item_call label="Консоль уведомлений" name="Notifications"/>
-			<menu_item_check label="Консоль размера текстуры" name="Texture Size"/>
-			<menu_item_check label="Консоль категории текстуры" name="Texture Category"/>
 			<menu_item_check label="Оперативные таймеры" name="Fast Timers"/>
 			<menu_item_check label="Память" name="Memory"/>
 			<menu_item_check label="Статистика по сцене" name="Scene Statistics"/>
+			<menu_item_call label="Консоль отладки извлечения текстур" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="Данные о регионе на консоль отладки" name="Region Info to Debug Console"/>
 			<menu_item_call label="Данны о группе на консоль отладки" name="Group Info to Debug Console"/>
 			<menu_item_call label="Данные о способностях на консоль отладки" name="Capabilities Info to Debug Console"/>
@@ -287,6 +286,12 @@
 			<menu_item_check label="Сложность визуализации" name="rendercomplexity"/>
 			<menu_item_check label="Байты присоединения" name="attachment bytes"/>
 			<menu_item_check label="Лепка" name="Sculpt"/>
+			<menu label="Плотность текстуры" name="Texture Density">
+				<menu_item_check label="Нет" name="None"/>
+				<menu_item_check label="Текущая" name="Current"/>
+				<menu_item_check label="Желаемая" name="Desired"/>
+				<menu_item_check label="Полная" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="Визуализация" name="Rendering">
 			<menu_item_check label="Оси" name="Axes"/>
@@ -304,7 +309,6 @@
 			<menu_item_check label="Текстуры анимаций" name="Animation Textures"/>
 			<menu_item_check label="Отключить текстуры" name="Disable Textures"/>
 			<menu_item_check label="Текстуры в полном разрешении" name="Rull Res Textures"/>
-			<menu_item_check label="Проверить текстуры" name="Audit Textures"/>
 			<menu_item_check label="Атлас текстур (экспериментальная функция)" name="Texture Atlas"/>
 			<menu_item_check label="Визуализация присоединенных источников света" name="Render Attached Lights"/>
 			<menu_item_check label="Визуализация присоединенных частиц" name="Render Attached Particles"/>
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index b4692385d1..97e5ee8c65 100644
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -495,6 +495,15 @@
 		</url>
 		<usetemplate ignoretext="Оборудование моего компьютера не поддерживается" name="okcancelignore" notext="Нет" yestext="Да"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		Возможно, для вашей видеокарты имеется более новый драйвер.  Обновление драйвера может существенно повысить быстродействие.
+
+    Проверить наличие обновления для драйвера по адресу [_URL]?
+		<url name="url">
+			http://www.intel.com/p/ru_RU/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/>
+	</notification>
 	<notification name="UnknownGPU">
 		В вашей системе установлена графическая карта, которую [APP_NAME] не может распознать.
 Так часто бывает, если новое оборудование еще не было проверено на работу с [APP_NAME].  Скорее всего, оно будет работать нормально, но, возможно, придется отрегулировать параметры графики.
@@ -2614,16 +2623,12 @@ http://secondlife.com/download.
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Объект «&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;», владелец которого – «[NAME]», желает:
-
-[QUESTIONS]
-Если вы не доверяете этому объекту или его создателю, отклоните запрос.
-
-Принять этот запрос?
+		Предупреждение. Объект «&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;» требует полного доступа к вашему аккаунту для Linden-долларов. Если разрешить такой доступ, объект сможет в любое время снимать средства с вашего аккаунта или полностью опустошать его неоднократно и без предупреждения.
+  
+Такое требование чаще всего незаконно. Не разрешайте доступ к своему аккаунту, если только не полностью осознаете, зачем он нужен этому объекту.
 		<form name="form">
-			<button name="Grant" text="Принять"/>
+			<button name="Grant" text="Разрешить полный доступ"/>
 			<button name="Deny" text="Отклонить"/>
-			<button name="Details" text="Подробности..."/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
@@ -3122,4 +3127,16 @@ http://secondlife.com/download.
 	<global name="You died and have been teleported to your home location">
 		Вы умерли и были телепортированы в ваше домашнее местоположение.
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		Не удалось обновить [FNAME]: файл не найден.
+Последующее обновление этого файла запрещается.
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		Не удалось открыть или декодировать [FNAME] с [NRETRIES] попыток. Этот файл считается поврежденным.
+Последующее обновление этого файла запрещается.
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		Попытка добавить недопустимый или нечитаемый файл изображения [FNAME], который не удалось открыть или декодировать.
+Попытка отменена.
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml b/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml
new file mode 100644
index 0000000000..a2d0237da0
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_script_question_toast.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 8dbc4f092d..6461e10e2d 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -883,6 +883,9 @@ support@secondlife.com.
 	<string name="ScriptQuestionCautionChatDenied">
 		Объекту «[OBJECTNAME]», который принадлежит пользователю «[OWNERNAME]» и находится в [REGIONPOS] в регионе «[REGIONNAME]», отказано в разрешении: [PERMISSIONS].
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		Разрешив доступ к своему аккаунту, вы также разрешите объекту:
+	</string>
 	<string name="ScriptTakeMoney">
 		У вас берут Linden-деньги
 	</string>
@@ -916,6 +919,9 @@ support@secondlife.com.
 	<string name="ControlYourCamera">
 		Управлять камерой
 	</string>
+	<string name="TeleportYourAgent">
+		Телепортировать вас
+	</string>
 	<string name="NotConnected">
 		Нет подключения
 	</string>
diff --git a/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml
index 8e056b9b0d..b204389083 100644
--- a/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/tr/floater_hardware_settings.xml
@@ -25,6 +25,10 @@
 		VBO Etkinleştir:
 	</text>
 	<check_box initial_value="true" label="OpenGL Vertex Tampon Nesnelerini Etkinleştir" name="vbo" tool_tip="Modern donanımlarda bunun etkinleştirilmesi performans artışı sağlar.  Ancak, eski donanımlardaki VBO uygulamaları yetersizdir ve etkinleştirildiğinde bilgisayarınız çökebilir."/>
+	<text name="tc label">
+		S3TC&apos;ü Etkinleştir:
+	</text>
+	<check_box initial_value="true" label="Doku Sıkıştırmasını Etkinleştir (yeniden başlatma gerektirir)" name="texture compression" tool_tip="Video bellekteki dokuları sıkıştırır, renk kalitesinde bazı kayıplar olmasına karşın daha yüksek çözünürlükte dokuların yüklenmesine imkan tanır."/>
 	<slider label="Doku Belleği (MB):" name="GraphicsCardTextureMemory" tool_tip="Dokular için tahsis edilecek bellek miktarı. Varsayılan değer video kartı belleğidir. Bu değerin küçültülmesi performansı artırabilir, ama ayrıca dokuları bulanıklaştırabilir."/>
 	<spinner label="Sis Mesafe Oranı:" name="fog"/>
 	<button label="Tamam" label_selected="Tamam" name="OK"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_stats.xml b/indra/newview/skins/default/xui/tr/floater_stats.xml
index 17f1166c46..e3f54fc338 100644
--- a/indra/newview/skins/default/xui/tr/floater_stats.xml
+++ b/indra/newview/skins/default/xui/tr/floater_stats.xml
@@ -14,8 +14,11 @@
 					<stat_bar label="Saniyede Bir Çizilen Üçgenler" name="ktrissec"/>
 					<stat_bar label="Toplam Nesne" name="objs"/>
 					<stat_bar label="Yeni Nesne" name="newobjs"/>
+					<stat_bar label="Nesne Önbellek İsabet Oranı" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="Doku" name="texture">
+					<stat_bar label="Önbellek İsabet Oranı" name="texture_cache_hits"/>
+					<stat_bar label="Önbellek Okuma Gecikme Süresi" name="texture_cache_read_latency"/>
 					<stat_bar label="Sayım" name="numimagesstat"/>
 					<stat_bar label="Ham Sayım" name="numrawimagesstat"/>
 					<stat_bar label="GL Belleği" name="gltexmemstat"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
index 4ef789f585..67bf9071b3 100644
--- a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
@@ -9,15 +9,26 @@
 	<text name="Multiple">
 		Birden çok doku
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="Envanter" name="inventory" value="0"/>
+		<radio_item label="Yerel" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		Büyüklük: [DIMENSIONS]
 	</text>
 	<button label="Varsayılan" label_selected="Varsayılan" name="Default"/>
-	<button label="Hiçbiri" label_selected="Hiçbiri" name="None"/>
 	<button label="Boş" label_selected="Boş" name="Blank"/>
-	<check_box initial_value="true" label="Şimdi uygula" name="apply_immediate_check"/>
+	<button label="Hiçbiri" label_selected="Hiçbiri" name="None"/>
 	<filter_editor label="Dokuları Filtrele" name="inventory search editor"/>
 	<check_box initial_value="false" label="Klasörleri göster" name="show_folders_check"/>
+	<button label="Ekle" label_selected="Ekle" name="l_add_btn"/>
+	<button label="Kaldır" label_selected="Kaldır" name="l_rem_btn"/>
+	<button label="Karşıya Yükle" label_selected="Karşıya Yükle" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="Ad" name="unit_name"/>
+		<column label="Kimlik" name="unit_id_HIDDEN"/>
+	</scroll_list>
 	<button label="Tamam" label_selected="Tamam" name="Select"/>
 	<button label="İptal" label_selected="İptal" name="Cancel"/>
+	<check_box initial_value="true" label="Şimdi uygula" name="apply_immediate_check"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml
new file mode 100644
index 0000000000..a592479b6c
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_texture_fetch_debugger.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="Doku Alımı Hata Ayıklayıcı">
+	<text name="total_num_fetched_label">
+		1, Alınan dokuların toplam sayısı: [NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, Toplam alım talebi sayısı: [NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, Toplam önbellek isabet sayısı: [NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, Görünür dokuların toplam sayısı: [NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, Görünür dokuların alınması için toplam talep sayısı: [NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, Alınan verilerin toplam sayısı: [SIZE1]KB, Şifresi Çözülen Veri: [SIZE2]KB, [PIXEL]MPiksel
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, Görünür verilerin toplam sayısı: [SIZE1]KB, Şifresi Çözülen Veri: [SIZE2]KB
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, İşlenen verilerin toplam sayısı: [SIZE1]KB, Şifresi Çözülen Veri: [SIZE2]KB, [PIXEL]MPiksel
+	</text>
+	<text name="total_time_cache_read_label">
+		9, Önbellek okunması için toplam süre: [TIME] saniye
+	</text>
+	<text name="total_time_cache_write_label">
+		10, Önbellek yazılması için toplam süre: [TIME] saniye
+	</text>
+	<text name="total_time_decode_label">
+		11, Şifre çözülmesi için toplam süre: [TIME] saniye
+	</text>
+	<text name="total_time_gl_label">
+		12, GL doku oluşturma için toplam süre: [TIME] saniye
+	</text>
+	<text name="total_time_http_label">
+		13, HTTP alımı için toplam süre: [TIME] saniye
+	</text>
+	<text name="total_time_fetch_label">
+		14, Tüm alımlar için toplam süre: [TIME] saniye
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, Görünür dokuların önbellekten tekrar alınması, Süre: [TIME] saniye, Alınan: [SIZE]KB, [PIXEL]MPiksel
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		16, Görünür dokuların HTTP&apos;den tekrar alınması, Süre: [TIME] saniye, Alınan: [SIZE]KB, [PIXEL]MPiksel
+	</text>
+	<spinner label="17, Teksel/Piksel Oranı:" name="texel_pixel_ratio"/>
+	<button label="Başla" name="start_btn"/>
+	<button label="Sıfırla" name="clear_btn"/>
+	<button label="Kapat" name="close_btn"/>
+	<button label="Önbellek Okunması" name="cacheread_btn"/>
+	<button label="Önbellek Yazılması" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="Şifre Çöz" name="decode_btn"/>
+	<button label="GL Dokusu" name="gl_btn"/>
+	<button label="Görünür Dokuları Önbellekten Tekrar Al" name="refetchviscache_btn"/>
+	<button label="Görünür Dokuları HTTP&apos;den Tekrar Al" name="refetchvishttp_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_window_size.xml b/indra/newview/skins/default/xui/tr/floater_window_size.xml
index acc2cc3376..aff20e7960 100644
--- a/indra/newview/skins/default/xui/tr/floater_window_size.xml
+++ b/indra/newview/skins/default/xui/tr/floater_window_size.xml
@@ -7,10 +7,17 @@
 		Pencere büyüklüğünü ayarla:
 	</text>
 	<combo_box name="window_size_combo" tool_tip="genişlik x yükseklik">
-		<combo_box.item label="1000 x 700 (varsayılan)" name="item0"/>
-		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 (720p)" name="item2"/>
-		<combo_box.item label="1920 x 1080 (1080p)" name="item3"/>
+		<combo_box.item label="1000 x 700 (varsayılan)" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
 	</combo_box>
 	<button label="Ayarla" name="set_btn"/>
 	<button label="İptal" name="cancel_btn"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index d7b20bac4b..ea84e7d24b 100644
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -225,11 +225,10 @@
 			<menu_item_check label="Doku Konsolu" name="Texture Console"/>
 			<menu_item_check label="Hata Ayıklama Konsolu" name="Debug Console"/>
 			<menu_item_call label="Bildirimler Konsolu" name="Notifications"/>
-			<menu_item_check label="Doku Büyüklüğü Konsolu" name="Texture Size"/>
-			<menu_item_check label="Doku Kategorisi Konsolu" name="Texture Category"/>
 			<menu_item_check label="Hızlı Zamanlayıcılar" name="Fast Timers"/>
 			<menu_item_check label="Bellek" name="Memory"/>
 			<menu_item_check label="Sahne İstatistikleri" name="Scene Statistics"/>
+			<menu_item_call label="Doku Alınması Hata Ayıklama Konsolu" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="Hata Ayıklama Konsoluna giden Bölge Bilgisi" name="Region Info to Debug Console"/>
 			<menu_item_call label="Hata Ayıklama Konsoluna giden Grup Bilgisi" name="Group Info to Debug Console"/>
 			<menu_item_call label="Hata Ayıklama Konsoluna giden Özellikler Bilgisi" name="Capabilities Info to Debug Console"/>
@@ -287,6 +286,12 @@
 			<menu_item_check label="İşleme Karmaşıklığı" name="rendercomplexity"/>
 			<menu_item_check label="Aksesuar Bayt Büyüklüğü" name="attachment bytes"/>
 			<menu_item_check label="Şekillendir" name="Sculpt"/>
+			<menu label="Doku Yoğunluğu" name="Texture Density">
+				<menu_item_check label="Yok" name="None"/>
+				<menu_item_check label="Mevcut" name="Current"/>
+				<menu_item_check label="Arzulanan" name="Desired"/>
+				<menu_item_check label="Tam" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="İşleme" name="Rendering">
 			<menu_item_check label="Eksenler" name="Axes"/>
@@ -304,7 +309,6 @@
 			<menu_item_check label="Animasyon Dokuları" name="Animation Textures"/>
 			<menu_item_check label="Dokuları Devre Dışı Bırak" name="Disable Textures"/>
 			<menu_item_check label="Tam Çöz. Dokular" name="Rull Res Textures"/>
-			<menu_item_check label="Dokuları Denetle" name="Audit Textures"/>
 			<menu_item_check label="Doku Atlas (deneysel)" name="Texture Atlas"/>
 			<menu_item_check label="Eklenmiş Işıkları İşle" name="Render Attached Lights"/>
 			<menu_item_check label="Eklenmiş Parçacıkları İşle" name="Render Attached Particles"/>
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index 6681cdac7a..27f0deaf4a 100644
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -495,6 +495,15 @@ Daha fazla bilgi için [_URL] adresini ziyaret etmek ister misiniz?
 		</url>
 		<usetemplate ignoretext="Bilgisayar donanımım desteklenmiyor" name="okcancelignore" notext="Hayır" yestext="Evet"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		Grafik yonganız için muhtemelen daha yeni bir sürücü mevcut.  Grafik sürücüleri güncellemek performansınızı kayda değer şekilde artırabilir.
+
+    Sürücü güncellemeleri için [_URL] adresini ziyaret etmek ister misiniz?
+		<url name="url">
+			http://www.intel.com/p/en_US/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Sisteminiz [APP_NAME] uygulamasının tanımadığı bir grafik kartı içeriyor.
 Bu durum genellikle [APP_NAME] uygulaması ile henüz denenmemiş yeni donanımlar kullanıldığında ortaya çıkar.  Büyük olasılıkla bir sorun çıkmayacaktır, fakat grafik ayarlarınızı değiştirmeniz gerekebilir.
@@ -2614,16 +2623,12 @@ Kabul ediyor musunuz?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		&apos;[NAME]&apos; adlı kişiye ait &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; adındaki bir nesne şunu yapmak istiyor:
-
-[QUESTIONS]
-Bu nesneye ya da onu oluşturan kişiye güvenmiyorsanız, bu talebi reddetmelisiniz.
-
-Talep kabul edilsin mi?
+		Uyarı: &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; nesnesi, Linden Dolar hesabınıza tam erişim istiyor. Eğer erişime izin verirseniz, süregelen bir şekilde, ilave uyarı olmaksızın, hesabınızdan herhangi bir zamanda fon çekebilir veya hesabınızı tamamen boşaltabilir.
+  
+Bu türden bir talebin yerinde olması nadir bir durumdur. Eğer hesabınıza neden erişmek istediğini tam olarak anlamıyorsanız, erişime izin vermeyin.
 		<form name="form">
-			<button name="Grant" text="Kabul Et"/>
+			<button name="Grant" text="Tam erişime izin ver"/>
 			<button name="Deny" text="Reddet"/>
-			<button name="Details" text="Ayrıntılar..."/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
@@ -3122,4 +3127,16 @@ Bir araziye sahip değilseniz, Harita&apos;ya bakıp &quot;Bilgi İstasyonu&quot
 	<global name="You died and have been teleported to your home location">
 		Hayatınızı kaybettiniz ve ana konumunuza ışınlandınız.
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		[FNAME] güncellenemedi çünkü bu dosya artık bulunamıyor.
+Bundan sonra bu dosya için güncellemeler devre dışı bırakılacak.
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[NRETRIES] girişimde [FNAME] açılamadı veya şifresi çözülemedi, bu dosya artık bozuk olarak değerlendiriliyor.
+Bundan sonra bu dosya için güncellemeler devre dışı bırakılacak.
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		Geçersiz veya okunamayan bir görüntü dosyası [FNAME] eklenmeye kalkışıldı, ancak dosya açılamadı veya şifresi çözülemedi.
+Girişim iptal edildi.
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml b/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml
new file mode 100644
index 0000000000..a2d0237da0
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_script_question_toast.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 2a4e2c20a7..a8a691a98e 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -883,6 +883,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="ScriptQuestionCautionChatDenied">
 		&apos;[OWNERNAME]&apos; adlı kişiye ait, [REGIONPOS] üzerinde [REGIONNAME] içerisinde bulunan &apos;[OBJECTNAME]&apos; nesnesine şunu yapma izni verilmedi: [PERMISSIONS].
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		Eğer hesabınıza erişime izin verirseniz, bu nesneye aynı zamanda şunun için izin vermiş olacaksınız:
+	</string>
 	<string name="ScriptTakeMoney">
 		Sizden Linden dolar (L$) almak
 	</string>
@@ -916,6 +919,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="ControlYourCamera">
 		Kameranızı kontrol etmek
 	</string>
+	<string name="TeleportYourAgent">
+		Sizi ışınlama
+	</string>
 	<string name="NotConnected">
 		Bağlı Değil
 	</string>
-- 
cgit v1.2.3


From bec4708fbab662651a7ebc28a3900b8a5e90c28b Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 5 Jul 2012 17:54:04 -0700
Subject: Adding the pathfinding attributes to the object profile panel.

---
 .../skins/default/xui/en/sidepanel_task_info.xml   | 1134 ++++++++++----------
 1 file changed, 576 insertions(+), 558 deletions(-)

(limited to 'indra/newview/skins')

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 d246918cd3..e9a787cef0 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_task_info.xml
@@ -1,437 +1,437 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel
-	 height="570"
-	 layout="topleft"
-	 name="object properties"
-	 help_topic="object_properties"
-	 title="Object Profile"
-	 width="333">
-	 <panel.string
-	  name="text deed continued">
-		Deed
-	 </panel.string>
-	<panel.string
-	 name="text deed">
-		Deed
-	</panel.string>
-            <panel.string
-             name="text modify info 1">
-                You can modify this object
-            </panel.string>
-            <panel.string
-             name="text modify info 2">
-                You can modify these objects
-            </panel.string>
-            <panel.string
-             name="text modify info 3">
-                You can't modify this object
-            </panel.string>
-            <panel.string
-             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 across a region boundary
-            </panel.string>
-            <panel.string
-             name="text modify info 6">
-                You can't modify these objects across a region boundary
-            </panel.string>
-            <panel.string
-             name="text modify warning">
-                This object has linked parts
-            </panel.string>
-            <panel.string
-             name="Cost Default">
-                Price: L$
-            </panel.string>
-            <panel.string
-             name="Cost Total">
-                Total Price: L$
-            </panel.string>
-            <panel.string
-             name="Cost Per Unit">
-                Price Per: L$
-            </panel.string>
-            <panel.string
-             name="Cost Mixed">
-                Mixed Price
-            </panel.string>
-            <panel.string
-             name="Sale Mixed">
-                Mixed Sale
-            </panel.string>
+    height="570"
+    layout="topleft"
+    name="object properties"
+    help_topic="object_properties"
+    title="Object Profile"
+    width="333">
+  <panel.string
+      name="text deed continued">
+    Deed
+  </panel.string>
+  <panel.string
+      name="text deed">
+    Deed
+  </panel.string>
+  <panel.string
+      name="text modify info 1">
+    You can modify this object
+  </panel.string>
+  <panel.string
+      name="text modify info 2">
+    You can modify these objects
+  </panel.string>
+  <panel.string
+      name="text modify info 3">
+    You can't modify this object
+  </panel.string>
+  <panel.string
+      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 across a region boundary
+  </panel.string>
+  <panel.string
+      name="text modify info 6">
+    You can't modify these objects across a region boundary
+  </panel.string>
+  <panel.string
+      name="text modify warning">
+    This object has linked parts
+  </panel.string>
+  <panel.string
+      name="Cost Default">
+    Price: L$
+  </panel.string>
+  <panel.string
+      name="Cost Total">
+    Total Price: L$
+  </panel.string>
+  <panel.string
+      name="Cost Per Unit">
+    Price Per: L$
+  </panel.string>
+  <panel.string
+      name="Cost Mixed">
+    Mixed Price
+  </panel.string>
+  <panel.string
+      name="Sale Mixed">
+    Mixed Sale
+  </panel.string>
+  <button
+      follows="top|left"
+      height="24"
+      image_hover_unselected="BackButton_Over"
+      image_pressed="BackButton_Press"
+      image_unselected="BackButton_Off"
+      layout="topleft"
+      left="8"
+      name="back_btn"
+      tab_stop="false"
+      top="0"
+      width="30"
+      use_draw_context_alpha="false" />
+  <text
+      follows="top|left|right"
+      font="SansSerifHuge"
+      height="26"
+      layout="topleft"
+      left_pad="10"
+      name="title"
+      text_color="LtGray"
+      top="0"
+      use_ellipses="true"
+      value="Object Profile"
+      width="290" />
+  <text
+      follows="top|left"
+      height="13"
+      layout="topleft"
+      left="45"
+      name="where"
+      text_color="LtGray_50"
+      value="(Inworld)"
+      width="150" />
+  <panel
+      follows="all"
+      height="490"
+      label=""
+      layout="topleft"
+      left="10"
+      help_topic=""
+      name="properties_panel"
+      top="45"
+      width="313"
+      background_visible="true"
+      bg_alpha_color="DkGray2">
+    <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left="5"
+        name="Name:"
+        top="10"
+        width="78">
+      Name:
+    </text>
+    <line_editor
+        border_style="line"
+        border_thickness="1"
+        follows="left|top|right"
+        height="20"
+        layout="topleft"
+        left_delta="78"
+        max_length_bytes="63"
+        name="Object Name"
+        top_delta="0"
+        width="225" />
+    <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="10"
+        layout="topleft"
+        left="5"
+        name="Description:"
+        top_pad="10"
+        width="78">
+      Description:
+    </text>
+    <line_editor
+        border_style="line"
+        border_thickness="1"
+        follows="left|top|right"
+        height="23"
+        layout="topleft"
+        name="Object Description"
+        select_on_focus="true"
+        left_delta="78"
+        max_length_bytes="127"
+        top_delta="-5"
+        width="225"/>
+    <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="23"
+        layout="topleft"
+        left="5"
+        name="CreatorNameLabel"
+        top_pad="12"
+        width="78">
+      Creator:
+    </text>
+    <text
+        type="string"
+        follows="left|right|top"
+        font="SansSerifSmall"
+        height="15"
+        layout="topleft"
+        left_pad="0"
+        name="Creator Name"
+        top_delta="0"
+        translate="false"
+        use_ellipses="true" 
+        width="225">
+      TestString PleaseIgnore
+    </text>
+    <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="23"
+        layout="topleft"
+        left="5"
+        name="Owner:"
+        top_pad="15"
+        width="78">
+      Owner:
+    </text>
+    <text
+        type="string"
+        follows="left|right|top"
+        font="SansSerifSmall"
+        height="15"
+        layout="topleft"
+        left_pad="0"
+        name="Owner Name"
+        top_delta="0"
+        translate="false"
+        use_ellipses="true" 
+        width="225">
+      TestString PleaseIgnore
+    </text>
+    <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="23"
+        layout="topleft"
+        left="5"
+        name="Group_label"
+        top_pad="15"
+        width="78">
+      Group:
+    </text>
     <button
-     follows="top|left"
-     height="24"
-     image_hover_unselected="BackButton_Over"
-     image_pressed="BackButton_Press"
-     image_unselected="BackButton_Off"
-     layout="topleft"
-     left="8"
-     name="back_btn"
-     tab_stop="false"
-     top="0"
-     width="30"
-     use_draw_context_alpha="false" />
-        <text
-     follows="top|left|right"
-     font="SansSerifHuge"
-     height="26"
-     layout="topleft"
-     left_pad="10"
-     name="title"
-     text_color="LtGray"
-     top="0"
-     use_ellipses="true"
-     value="Object Profile"
-     width="290" />
-	    <text
-     follows="top|left"
-     height="13"
-     layout="topleft"
-     left="45"
-     name="where"
-     text_color="LtGray_50"
-     value="(Inworld)"
-     width="150" />
-	<panel
-         follows="all"
-         height="490"
-         label=""
-         layout="topleft"
-         left="10"
-         help_topic=""
-         name="properties_panel"
-         top="45"
-         width="313"
-   background_visible="true"
-   bg_alpha_color="DkGray2">
-	    	    <text
-		     type="string"
-		     length="1"
-		     follows="left|top"
-		     height="10"
-		     layout="topleft"
-		     left="5"
-             name="Name:"
-		     top="10"
-		     width="78">
-	        Name:
-	    </text>
-	    <line_editor
-		     border_style="line"
-		     border_thickness="1"
-	    	 follows="left|top|right"
-		     height="20"
-		     layout="topleft"
-	    	 left_delta="78"
-		     max_length_bytes="63"
-             name="Object Name"
-	    	 top_delta="0"
-		     width="225" />
-	    <text
-	    type="string"
-	    length="1"
-	    follows="left|top"
-	    height="10"
-	    layout="topleft"
-	    left="5"
-             name="Description:"
-	    top_pad="10"
-	    width="78">
-	        Description:
-	    </text>
-            <line_editor
-	     border_style="line"
-    	     border_thickness="1"
-             follows="left|top|right"
-             height="23"
-             layout="topleft"
-             name="Object Description"
-             select_on_focus="true"
-    		 left_delta="78"
-		     max_length_bytes="127"
-	    	 top_delta="-5"
-	    	 width="225"/>
-	    <text
-		     type="string"
-		     length="1"
-		     follows="left|top"
-		     height="23"
-		     layout="topleft"
-    		 left="5"
-		 name="CreatorNameLabel"
-		  top_pad="12"
-		     width="78">
-	        Creator:
-    	</text>
-	    <text
-		     type="string"
-     follows="left|right|top"
-     font="SansSerifSmall"
-     height="15"
-     layout="topleft"
-     left_pad="0"
-             name="Creator Name"
-		     top_delta="0"
-		     translate="false"
-         use_ellipses="true" 
-		     width="225">
-	        TestString PleaseIgnore
-	     </text>
-	    <text
-			 type="string"
-			 length="1"
-			 follows="left|top"
-			 height="23"
-			layout="topleft"
-			left="5"
-			name="Owner:"
-			top_pad="15"
-			 width="78">
-			    Owner:
-	     </text>
-	     <text
-			    type="string"
-			    follows="left|right|top"
-			    font="SansSerifSmall"
-			    height="15"
-			    layout="topleft"
-			    left_pad="0"
-			    name="Owner Name"
-			    top_delta="0"
-			    translate="false"
-          use_ellipses="true" 
-			    width="225">
-			    TestString PleaseIgnore
-	     </text>
-	    	    <text
-			 type="string"
-			 length="1"
-			 follows="left|top"
-			 height="23"
-			 layout="topleft"
-			 left="5"
-			name="Group_label"
-			top_pad="15"
-			width="78">
-			    Group:
-	     </text>
-      		<button
-			 follows="top|left"
-			 height="10"
-			 image_disabled="Activate_Checkmark"
-			 image_selected="Activate_Checkmark"
-			 image_unselected="Activate_Checkmark"
-			 image_color="White_50"
-			 layout="topleft"
-			 left_pad="0"
-			 top_delta="0"
-			 name="button set group"
-			 tab_stop="false"
-			 tool_tip="Choose a group to share this object's permissions"
-			 width="10" />
-            <name_box
-             follows="left|top"
-             height="18"
-             initial_value="Loading..."
-             layout="topleft"
-             left_pad="5"
-             top_delta="-1"
-             name="Group Name Proxy"
-             width="150" />
-            <button
-             follows="top|left"
-             height="23"
-             label="Deed"
-             label_selected="Deed"
-             layout="topleft"
-             name="button deed"
-             top_pad="0"
-             left="81"
-             tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."
-             width="100" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="9"
-             layout="topleft"
-             top_pad="5"
-             left="5"
-             name="label click action"
-             width="280">
-                Click to:
-            </text>
-            <combo_box
-             follows="left|top"
-             height="23"
-             layout="topleft"
-             name="clickaction"
-             width="168"
-             left="81">
-                <combo_box.item
-                 label="Touch  (default)"
-                 name="Touch/grab(default)"
-                 value="Touch" />
-                <combo_box.item
-                 label="Sit on object"
-                 name="Sitonobject"
-                 value="Sit" />
-                <combo_box.item
-                 label="Buy object"
-                 name="Buyobject"
-                 value="Buy" />
-                <combo_box.item
-                 label="Pay object"
-                 name="Payobject"
-                 value="Pay" />
-                <combo_box.item
-                 label="Open"
-                 name="Open"
-                 value="Open" />
-            </combo_box>
-	 <panel
-         border="false"
-         follows="left|top"
-         layout="topleft"
-         mouse_opaque="false"
-         background_visible="true"
-         bg_alpha_color="DkGray"
-         name="perms_inv"
-         left="0"
-         top_pad="15"
-         height="135"
-         width="313">
-	  <text
-             type="string"
-             length="1"
-             left="10"
-             top_pad="15"
-             text_color="EmphasisColor"
-	     height="15"
-             follows="left|top|right"
-             layout="topleft"
-             name="perm_modify"
-             width="310">
-                You can modify this object
-            </text>
-	  	    <text
-			 type="string"
-			 length="1"
-			 follows="left|top"
-			 height="16"
-			 layout="topleft"
-			 left="10"
-               name="Anyone can:"
-			 top_pad="8"
-			 width="100">
-			Anyone:
-	    </text>
-	    <check_box
-			 height="18"
-			 label="Copy"
-			 layout="topleft"
-			 left_pad="0"
-             name="checkbox allow everyone copy"
-			 top_delta="-2"
-			 width="90" />
-	    <check_box
-             height="18"
-             label="Move"
-             layout="topleft"
-             name="checkbox allow everyone move"
-			 left_pad="0"
-             width="150" />
-	       	<text
-			 type="string"
-			 length="1"
-			 follows="left|top"
-			 height="16"
-			 layout="topleft"
-			 left="10"
-			 name="GroupLabel"
-			 top_pad="8"
-			 width="100">
-			Group:
-    	</text>
-			    <check_box
-			 height="18"
-			 label="Share"
-			 layout="topleft"
-			 left_pad="90"
-			 top_delta="-2"
-             name="checkbox share with group"
-			 tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
-			 width="150" />
-	    	    <text
-			 type="string"
-			 length="1"
-			 follows="left|top"
-			 height="16"
-			 layout="topleft"
-			 left="10"
-			 name="NextOwnerLabel"
-			 top_pad="8"
-			 width="200"
-			 word_wrap="true">
-			Next owner:
-	    </text>
-	    <check_box
-			 height="18"
-			 label="Modify"
-			 layout="topleft"
-			 left="20"
-			 top_pad="0"
-             name="checkbox next owner can modify"
-			 width="90" />
-	    <check_box
-			 height="18"
-			 label="Copy"
-			 layout="topleft"
-			 left_pad="0"
-             name="checkbox next owner can copy"
-			 width="90" />
-	    <check_box
-			 height="18"
-			 label="Transfer"
-			 layout="topleft"
-			 left_pad="0"
-             name="checkbox next owner can transfer"
-			 tool_tip="Next owner can give away or resell this object"
-			 width="106" />
-	    </panel>
-	    <check_box
-			 height="23"
-			 label="For Sale"
-			 layout="topleft"
-			 left="20"
-             name="checkbox for sale"
-			 top_pad="10"
-			 width="100" />
-		<combo_box
-			 height="23"
-			 left_pad="0"
-			 layout="topleft"
-			 follows="left|top"
-            name="sale type"
-			 width="170">
-        <combo_box.item
-           name="Copy"
-           label="Copy"
-           value="2" />
-        <combo_box.item
-           name="Contents"
-           label="Contents"
-           value="3" />
-        <combo_box.item
-           name="Original"
-           label="Original"
-           value="1" />
-	    </combo_box>
-		<spinner
+        follows="top|left"
+        height="10"
+        image_disabled="Activate_Checkmark"
+        image_selected="Activate_Checkmark"
+        image_unselected="Activate_Checkmark"
+        image_color="White_50"
+        layout="topleft"
+        left_pad="0"
+        top_delta="0"
+        name="button set group"
+        tab_stop="false"
+        tool_tip="Choose a group to share this object's permissions"
+        width="10" />
+    <name_box
+        follows="left|top"
+        height="18"
+        initial_value="Loading..."
+        layout="topleft"
+        left_pad="5"
+        top_delta="-1"
+        name="Group Name Proxy"
+        width="150" />
+    <button
+        follows="top|left"
+        height="23"
+        label="Deed"
+        label_selected="Deed"
+        layout="topleft"
+        name="button deed"
+        top_pad="0"
+        left="81"
+        tool_tip="Deeding gives this item away with next owner permissions. Group shared objects can be deeded by a group officer."
+        width="100" />
+    <text
+        type="string"
+        length="1"
+        follows="left|top"
+        height="9"
+        layout="topleft"
+        top_pad="5"
+        left="5"
+        name="label click action"
+        width="280">
+      Click to:
+    </text>
+    <combo_box
+        follows="left|top"
+        height="23"
+        layout="topleft"
+        name="clickaction"
+        width="168"
+        left="81">
+      <combo_box.item
+          label="Touch  (default)"
+          name="Touch/grab(default)"
+          value="Touch" />
+      <combo_box.item
+          label="Sit on object"
+          name="Sitonobject"
+          value="Sit" />
+      <combo_box.item
+          label="Buy object"
+          name="Buyobject"
+          value="Buy" />
+      <combo_box.item
+          label="Pay object"
+          name="Payobject"
+          value="Pay" />
+      <combo_box.item
+          label="Open"
+          name="Open"
+          value="Open" />
+    </combo_box>
+    <panel
+        border="false"
+        follows="left|top"
+        layout="topleft"
+        mouse_opaque="false"
+        background_visible="true"
+        bg_alpha_color="DkGray"
+        name="perms_inv"
+        left="0"
+        top_pad="15"
+        height="135"
+        width="313">
+      <text
+          type="string"
+          length="1"
+          left="5"
+          top_pad="15"
+          text_color="EmphasisColor"
+          height="15"
+          follows="left|top|right"
+          layout="topleft"
+          name="perm_modify"
+          width="310">
+        You can modify this object
+      </text>
+      <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="10"
+          name="Anyone can:"
+          top_pad="8"
+          width="100">
+        Anyone:
+      </text>
+      <check_box
+          height="18"
+          label="Copy"
+          layout="topleft"
+          left_pad="0"
+          name="checkbox allow everyone copy"
+          top_delta="-2"
+          width="90" />
+      <check_box
+          height="18"
+          label="Move"
+          layout="topleft"
+          name="checkbox allow everyone move"
+          left_pad="0"
+          width="150" />
+      <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="10"
+          name="GroupLabel"
+          top_pad="8"
+          width="100">
+        Group:
+      </text>
+      <check_box
+          height="18"
+          label="Share"
+          layout="topleft"
+          left_pad="90"
+          top_delta="-2"
+          name="checkbox share with group"
+          tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
+          width="150" />
+      <text
+          type="string"
+          length="1"
+          follows="left|top"
+          height="16"
+          layout="topleft"
+          left="10"
+          name="NextOwnerLabel"
+          top_pad="8"
+          width="200"
+          word_wrap="true">
+        Next owner:
+      </text>
+      <check_box
+          height="18"
+          label="Modify"
+          layout="topleft"
+          left="20"
+          top_pad="0"
+          name="checkbox next owner can modify"
+          width="90" />
+      <check_box
+          height="18"
+          label="Copy"
+          layout="topleft"
+          left_pad="0"
+          name="checkbox next owner can copy"
+          width="90" />
+      <check_box
+          height="18"
+          label="Transfer"
+          layout="topleft"
+          left_pad="0"
+          name="checkbox next owner can transfer"
+          tool_tip="Next owner can give away or resell this object"
+          width="106" />
+    </panel>
+    <check_box
+        height="23"
+        label="For Sale"
+        layout="topleft"
+        left="20"
+        name="checkbox for sale"
+        top_pad="10"
+        width="100" />
+    <combo_box
+        height="23"
+        left_pad="0"
+        layout="topleft"
+        follows="left|top"
+        name="sale type"
+        width="170">
+      <combo_box.item
+          name="Copy"
+          label="Copy"
+          value="2" />
+      <combo_box.item
+          name="Contents"
+          label="Contents"
+          value="3" />
+      <combo_box.item
+          name="Original"
+          label="Original"
+          value="1" />
+    </combo_box>
+    <spinner
         follows="left|top"
         decimal_digits="0"
         increment="1"
@@ -445,132 +445,150 @@
         min_val="1"
         height="20"
         max_val="999999999" />
-      <check_box
-	   height="20"
-	   width="110"
-	   top_pad="6"
-	   label="Show in search"
-       layout="topleft"
-	   left="120"
-       name="search_check"
-       tool_tip="Let people see this object in search results" />
-            <text
-             type="string"
-             text_color="EmphasisColor"
-             length="1"
-             top_pad="15"
-             follows="left|top"
-             layout="topleft"
-             left="10"
-             name="B:"
-             height="10"
-             width="50">
-                B:
-            </text>
-            <text
-             type="string"
-             text_color="White"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left_pad="0"
-             name="O:"
-             height="10"
-             width="50">
-                O:
-            </text>
-            <text
-             type="string"
-             text_color="EmphasisColor"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left_pad="0"
-             name="G:"
-             height="10"
-             width="50">
-                G:
-            </text>
-            <text
-             type="string"
-             text_color="White"
-             length="1"
-             follows="left|top"
-             left_pad="0"
-             layout="topleft"
-             name="E:"
-             height="10"
-             width="50">
-                E:
-            </text>
-            <text
-             type="string"
-             text_color="EmphasisColor"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left_pad="0"
-             name="N:"
-             height="10"
-             width="50">
-                N:
-            </text>
-            <text
-             type="string"
-             text_color="White"
-             length="1"
-             follows="left|top"
-             layout="topleft"
-             left_pad="0"
-             name="F:"
-             height="10"
-             width="50">
-                F:
-            </text>
-		</panel>
-    <panel
-		 height="25"
-		 layout="bottomright"
-		 name="button_panel"
-		 left="5"
-		 bottom="5"
-		 width="313">
-        <button
-		     follows="bottom|left"
-		     height="23"
-		     label="Open"
-		     layout="topleft"
-		     left="5"
-		     name="open_btn"
-		     top="0"
-		     width="73" />
-	    <button
-		     follows="bottom|left"
-		     height="23"
-		     label="Pay"
-		     layout="topleft"
-		     left_pad="5"
-		     name="pay_btn"
-		     top="0"
-		     width="73" />
-	    <button
-		     follows="bottom|left"
-		     height="23"
-		     label="Buy"
-		     layout="topleft"
-		     left_pad="5"
-		     name="buy_btn"
-		     top="0"
-		     width="73" />
-        <button
-		     follows="bottom|left"
-		     height="23"
-		     label="Details"
-		     layout="topleft"
-		     left_pad="5"
-		     name="details_btn"
-		     top="0"
-		     width="74" />
+    <check_box
+        height="20"
+        width="110"
+        top_pad="6"
+        label="Show in search"
+        layout="topleft"
+        left="120"
+        name="search_check"
+        tool_tip="Let people see this object in search results" />
+    <text
+        type="string"
+        follows="left|top"
+        name="pathfinding_attributes_label"
+        top_pad="6"
+        width="150"
+        left="5">
+      Pathfinding attributes:
+    </text>
+    <text
+        type="string"
+        follows="left|top"
+        text_color="EmphasisColor"
+        name="pathfinding_attributes_value"
+        width="130"
+        word_wrap="false"
+        left_pad="0">
+    </text>
+    <text
+        type="string"
+        text_color="EmphasisColor"
+        length="1"
+        top_pad="10"
+        follows="left|top"
+        layout="topleft"
+        left="10"
+        name="B:"
+        height="10"
+        width="50">
+      B:
+    </text>
+    <text
+        type="string"
+        text_color="White"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left_pad="0"
+        name="O:"
+        height="10"
+        width="50">
+      O:
+    </text>
+    <text
+        type="string"
+        text_color="EmphasisColor"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left_pad="0"
+        name="G:"
+        height="10"
+        width="50">
+      G:
+    </text>
+    <text
+        type="string"
+        text_color="White"
+        length="1"
+        follows="left|top"
+        left_pad="0"
+        layout="topleft"
+        name="E:"
+        height="10"
+        width="50">
+      E:
+    </text>
+    <text
+        type="string"
+        text_color="EmphasisColor"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left_pad="0"
+        name="N:"
+        height="10"
+        width="50">
+      N:
+    </text>
+    <text
+        type="string"
+        text_color="White"
+        length="1"
+        follows="left|top"
+        layout="topleft"
+        left_pad="0"
+        name="F:"
+        height="10"
+        width="50">
+      F:
+    </text>
+  </panel>
+  <panel
+      height="25"
+      layout="bottomright"
+      name="button_panel"
+      left="5"
+      bottom="5"
+      width="313">
+    <button
+        follows="bottom|left"
+        height="23"
+        label="Open"
+        layout="topleft"
+        left="5"
+        name="open_btn"
+        top="0"
+        width="73" />
+    <button
+        follows="bottom|left"
+        height="23"
+        label="Pay"
+        layout="topleft"
+        left_pad="5"
+        name="pay_btn"
+        top="0"
+        width="73" />
+    <button
+        follows="bottom|left"
+        height="23"
+        label="Buy"
+        layout="topleft"
+        left_pad="5"
+        name="buy_btn"
+        top="0"
+        width="73" />
+    <button
+        follows="bottom|left"
+        height="23"
+        label="Details"
+        layout="topleft"
+        left_pad="5"
+        name="details_btn"
+        top="0"
+        width="74" />
 
-	</panel>
+  </panel>
 </panel>
-- 
cgit v1.2.3


From 06bb4a832ad3c9e25e217864af69a63f66a8025a Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Mon, 9 Jul 2012 16:14:00 -0400
Subject: correct dos line endings

---
 .../xui/en/floater_texture_fetch_debugger.xml      | 682 ++++++++++-----------
 1 file changed, 341 insertions(+), 341 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
index 44b6a63bca..f3f8d4ddca 100644
--- a/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
+++ b/indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
@@ -1,341 +1,341 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_minimize="false"
- height="550"
- layout="topleft"
- name="TexFetchDebugger"
- help_topic="texfetchdebugger"
- title="Texture Fetching Debugger"
- width="540">
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left="10"
-   name="total_num_fetched_label"
-   top="30"
-   width="400">
-    1, Total number of fetched textures: [NUM]
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_num_fetching_requests_label"
-   top_delta="25"
-   width="400">
-    2, Total number of fetching requests: [NUM]
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_num_cache_hits_label"
-   top_delta="25"
-   width="400">
-    3, Total number of cache hits: [NUM]
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_num_visible_tex_label"
-   top_delta="25"
-   width="400">
-    4, Total number of visible textures: [NUM]
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_num_visible_tex_fetch_req_label"
-   top_delta="25"
-   width="450">
-    5, Total number of visible texture fetching requests: [NUM]
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_fetched_data_label"
-   top_delta="25"
-   width="530">
-    6, Total number of fetched data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_fetched_vis_data_label"
-   top_delta="25"
-   width="480">
-    7, Total number of visible data: [SIZE1]KB, Decoded Data: [SIZE2]KB
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_fetched_rendered_data_label"
-   top_delta="25"
-   width="530">
-    8, Total number of rendered data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_cache_read_label"
-   top_delta="25"
-   width="400">
-    9, Total time on cache readings: [TIME] seconds
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_cache_write_label"
-   top_delta="25"
-   width="400">
-    10, Total time on cache writings: [TIME] seconds
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_decode_label"
-   top_delta="25"
-   width="400">
-    11, Total time on decodings: [TIME] seconds
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_gl_label"
-   top_delta="25"
-   width="400">
-    12, Total time on gl texture creation: [TIME] seconds
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_http_label"
-   top_delta="25"
-   width="400">
-    13, Total time on HTTP fetching: [TIME] seconds
-  </text>
-  <text
-   type="string"
-   length="1"
-   follows="left|top"
-   height="25"
-   layout="topleft"
-   left_delta="0"
-   name="total_time_fetch_label"
-   top_delta="25"
-   width="400">
-    14, Total time on entire fetching: [TIME] seconds
-  </text>
-  <text
-  type="string"
-  length="1"
-  follows="left|top"
-  height="25"
-  layout="topleft"
-  left_delta="0"
-  name="total_time_refetch_vis_cache_label"
-  top_delta="25"
-  width="540">
-    15, Refetching visibles from cache, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
-  </text>
-  <text
-  type="string"
-  length="1"
-  follows="left|top"
-  height="25"
-  layout="topleft"
-  left_delta="0"
-  name="total_time_refetch_vis_http_label"
-  top_delta="25"
-  width="540">
-    16, Refetching visibles from HTTP, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
-  </text>
-  <spinner
-     decimal_digits="2"
-     follows="left|top"
-     height="20"
-     increment="0.01"
-     initial_value="1.0"
-     label="17, Ratio of Texel/Pixel:"
-     label_width="130"
-     layout="topleft"
-     left_delta="0"
-     max_val="10.0"
-     min_val="0.01"
-     name="texel_pixel_ratio"
-     top_delta="30"
-     width="200">
-    <spinner.commit_callback
-		function="TexFetchDebugger.ChangeTexelPixelRatio" />
-  </spinner>
-  <button
-   follows="left|top"
-   height="20"
-   label="Start"
-   layout="topleft"
-   left_delta="0"
-   name="start_btn"
-   top_delta="30"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.Start" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Reset"
-   layout="topleft"
-   left_pad="7"
-   name="clear_btn"
-   top_delta="0"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.Clear" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Close"
-   layout="topleft"
-   left_pad="7"
-   name="close_btn"
-   top_delta="0"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.Close" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Cache Read"
-   layout="topleft"
-   left="10"
-   name="cacheread_btn"
-   top_delta="30"
-   width="80">
-    <button.commit_callback
-		function="TexFetchDebugger.CacheRead" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Cache Write"
-   layout="topleft"
-   left_pad="7"
-   name="cachewrite_btn"
-   top_delta="0"
-   width="80">
-    <button.commit_callback
-		function="TexFetchDebugger.CacheWrite" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="HTTP"
-   layout="topleft"
-   left_pad="7"
-   name="http_btn"
-   top_delta="0"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.HTTPLoad" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Decode"
-   layout="topleft"
-   left_pad="7"
-   name="decode_btn"
-   top_delta="0"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.Decode" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="GL Texture"
-   layout="topleft"
-   left_pad="7"
-   name="gl_btn"
-   top_delta="0"
-   width="70">
-    <button.commit_callback
-		function="TexFetchDebugger.GLTexture" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Refetch Vis Cache"
-   layout="topleft"
-   left="10"
-   name="refetchviscache_btn"
-   top_delta="30"
-   width="120">
-    <button.commit_callback
-		function="TexFetchDebugger.RefetchVisCache" />
-  </button>
-  <button
-   follows="left|top"
-   height="20"
-   label="Refetch Vis HTTP"
-   layout="topleft"
-   left_pad="7"
-   name="refetchvishttp_btn"
-   top_delta="0"
-   width="120">
-    <button.commit_callback
-		function="TexFetchDebugger.RefetchVisHTTP" />
-  </button>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_minimize="false"
+ height="550"
+ layout="topleft"
+ name="TexFetchDebugger"
+ help_topic="texfetchdebugger"
+ title="Texture Fetching Debugger"
+ width="540">
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left="10"
+   name="total_num_fetched_label"
+   top="30"
+   width="400">
+    1, Total number of fetched textures: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_num_fetching_requests_label"
+   top_delta="25"
+   width="400">
+    2, Total number of fetching requests: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_num_cache_hits_label"
+   top_delta="25"
+   width="400">
+    3, Total number of cache hits: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_num_visible_tex_label"
+   top_delta="25"
+   width="400">
+    4, Total number of visible textures: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_num_visible_tex_fetch_req_label"
+   top_delta="25"
+   width="450">
+    5, Total number of visible texture fetching requests: [NUM]
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_fetched_data_label"
+   top_delta="25"
+   width="530">
+    6, Total number of fetched data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_fetched_vis_data_label"
+   top_delta="25"
+   width="480">
+    7, Total number of visible data: [SIZE1]KB, Decoded Data: [SIZE2]KB
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_fetched_rendered_data_label"
+   top_delta="25"
+   width="530">
+    8, Total number of rendered data: [SIZE1]KB, Decoded Data: [SIZE2]KB, [PIXEL]MPixels
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_cache_read_label"
+   top_delta="25"
+   width="400">
+    9, Total time on cache readings: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_cache_write_label"
+   top_delta="25"
+   width="400">
+    10, Total time on cache writings: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_decode_label"
+   top_delta="25"
+   width="400">
+    11, Total time on decodings: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_gl_label"
+   top_delta="25"
+   width="400">
+    12, Total time on gl texture creation: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_http_label"
+   top_delta="25"
+   width="400">
+    13, Total time on HTTP fetching: [TIME] seconds
+  </text>
+  <text
+   type="string"
+   length="1"
+   follows="left|top"
+   height="25"
+   layout="topleft"
+   left_delta="0"
+   name="total_time_fetch_label"
+   top_delta="25"
+   width="400">
+    14, Total time on entire fetching: [TIME] seconds
+  </text>
+  <text
+  type="string"
+  length="1"
+  follows="left|top"
+  height="25"
+  layout="topleft"
+  left_delta="0"
+  name="total_time_refetch_vis_cache_label"
+  top_delta="25"
+  width="540">
+    15, Refetching visibles from cache, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
+  </text>
+  <text
+  type="string"
+  length="1"
+  follows="left|top"
+  height="25"
+  layout="topleft"
+  left_delta="0"
+  name="total_time_refetch_vis_http_label"
+  top_delta="25"
+  width="540">
+    16, Refetching visibles from HTTP, Time: [TIME] seconds, Fetched: [SIZE]KB, [PIXEL]MPixels
+  </text>
+  <spinner
+     decimal_digits="2"
+     follows="left|top"
+     height="20"
+     increment="0.01"
+     initial_value="1.0"
+     label="17, Ratio of Texel/Pixel:"
+     label_width="130"
+     layout="topleft"
+     left_delta="0"
+     max_val="10.0"
+     min_val="0.01"
+     name="texel_pixel_ratio"
+     top_delta="30"
+     width="200">
+    <spinner.commit_callback
+		function="TexFetchDebugger.ChangeTexelPixelRatio" />
+  </spinner>
+  <button
+   follows="left|top"
+   height="20"
+   label="Start"
+   layout="topleft"
+   left_delta="0"
+   name="start_btn"
+   top_delta="30"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.Start" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Reset"
+   layout="topleft"
+   left_pad="7"
+   name="clear_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.Clear" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Close"
+   layout="topleft"
+   left_pad="7"
+   name="close_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.Close" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Cache Read"
+   layout="topleft"
+   left="10"
+   name="cacheread_btn"
+   top_delta="30"
+   width="80">
+    <button.commit_callback
+		function="TexFetchDebugger.CacheRead" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Cache Write"
+   layout="topleft"
+   left_pad="7"
+   name="cachewrite_btn"
+   top_delta="0"
+   width="80">
+    <button.commit_callback
+		function="TexFetchDebugger.CacheWrite" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="HTTP"
+   layout="topleft"
+   left_pad="7"
+   name="http_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.HTTPLoad" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Decode"
+   layout="topleft"
+   left_pad="7"
+   name="decode_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.Decode" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="GL Texture"
+   layout="topleft"
+   left_pad="7"
+   name="gl_btn"
+   top_delta="0"
+   width="70">
+    <button.commit_callback
+		function="TexFetchDebugger.GLTexture" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Refetch Vis Cache"
+   layout="topleft"
+   left="10"
+   name="refetchviscache_btn"
+   top_delta="30"
+   width="120">
+    <button.commit_callback
+		function="TexFetchDebugger.RefetchVisCache" />
+  </button>
+  <button
+   follows="left|top"
+   height="20"
+   label="Refetch Vis HTTP"
+   layout="topleft"
+   left_pad="7"
+   name="refetchvishttp_btn"
+   top_delta="0"
+   width="120">
+    <button.commit_callback
+		function="TexFetchDebugger.RefetchVisHTTP" />
+  </button>
+</floater>
-- 
cgit v1.2.3


From 241a446224013f76fee83e786568862068b60309 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 10 Jul 2012 12:30:15 -0700
Subject: Adding the example use type labels to the pathfinding linksets
 floater.

---
 .../xui/en/floater_pathfinding_linksets.xml        | 69 +++++++++++++++++++++-
 1 file changed, 67 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
index 833e5489ba..cd0f57be99 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="382"
+    height="395"
     width="1015"
-    min_height="382"
+    min_height="395"
     min_width="1015"
     layout="topleft"
     name="floater_pathfinding_linksets"
@@ -428,6 +428,7 @@
         top_pad="-19"
         max_length_chars="3"
         name="edit_a_value"
+        tool_tip="Walkability for characters of type A.  Example character type is humanoid."
         width="45" />
     <text
         height="13"
@@ -455,6 +456,7 @@
         top_pad="-19"
         max_length_chars="3"
         name="edit_b_value"
+        tool_tip="Walkability for characters of type B.  Example character type is creature."
         width="45" />
     <text
         height="13"
@@ -482,6 +484,7 @@
         top_pad="-19"
         max_length_chars="3"
         name="edit_c_value"
+        tool_tip="Walkability for characters of type C.  Example character type is mechanical."
         width="45" />
     <text
         height="13"
@@ -509,6 +512,7 @@
         top_pad="-19"
         max_length_chars="3"
         name="edit_d_value"
+        tool_tip="Walkability for characters of type D.  Example character type is other."
         width="45" />
     <button
         follows="right|bottom"
@@ -519,5 +523,66 @@
         top_pad="-21"
         left_pad="40"
         width="140"/>
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        name="suggested_use_a_label"
+        length="1"
+        follows="left|bottom"
+        layout="topleft"
+        left="363"
+        top_pad="5"
+        width="107">
+      (Humanoid)
+    </text>
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        name="suggested_use_b_label"
+        length="1"
+        follows="left|bottom"
+        layout="topleft"
+        left_pad="0"
+        width="107">
+      (Creature)
+    </text>
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        name="suggested_use_c_label"
+        length="1"
+        follows="left|bottom"
+        layout="topleft"
+        left_pad="0"
+        width="107">
+      (Mechanical)
+    </text>
+    <text
+        height="13"
+        word_wrap="false"
+        use_ellipses="false"
+        type="string"
+        text_color="LabelTextColor"
+        text_readonly_color="LabelDisabledColor"
+        name="suggested_use_d_label"
+        length="1"
+        follows="left|bottom"
+        layout="topleft"
+        left_pad="0"
+        width="107">
+      (Other)
+    </text>
   </panel>
 </floater>
-- 
cgit v1.2.3


From 5cc36ff2285aeed2617e71c7cb7060c825dbd203 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Thu, 12 Jul 2012 18:40:51 -0700
Subject: Cleaning up some runtime output warning messages about invalid XUI
 syntax.

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

(limited to 'indra/newview/skins')

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 4331e1f340..abe918bfbe 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
-    open_positioning="cascading"
+    positioning="cascading"
     can_resize="true"
     can_tear_off="false"
     height="273"
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 63e626b43b..2629313069 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
-    open_positioning="cascading"
+    positioning="cascading"
     can_tear_off="false"
     height="498"
     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 cd0f57be99..ef3ba25867 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
-    open_positioning="cascading"
+    positioning="cascading"
     can_resize="true"
     can_tear_off="false"
     height="395"
-- 
cgit v1.2.3


From 856827de235106d55480772fb5501c276ba7ecb3 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 18 Jul 2012 14:12:32 -0700
Subject: Updating the build tools floater to better handle multi-line creator
 and owner names.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index a2fc16ac01..5204efbf65 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2,7 +2,7 @@
 <floater
  positioning="cascading"
  legacy_header_height="18"
- height="580"
+ height="590"
  layout="topleft"
  bg_opaque_image="Window_NoTitle_Foreground"
  bg_alpha_image="Window_NoTitle_Background"
@@ -949,7 +949,7 @@
              left="10"
              length="1"
              follows="left|top"
-             height="19"
+             height="29"
              layout="topleft"
              name="Creator:"
              top_pad="7"
@@ -962,7 +962,7 @@
              length="1"
              follows="left|top"
              left_pad="0"
-             height="20"
+             height="29"
              layout="topleft"
              name="Creator Name"
              top_delta="0"
@@ -977,7 +977,7 @@
              length="1"
              left="10"
              follows="left|top"
-             height="19"
+             height="29"
              layout="topleft"
              name="Owner:"
              top_pad="3"
@@ -989,7 +989,7 @@
              type="string"
              length="1"
              follows="left|top"
-             height="20"
+             height="29"
              layout="topleft"
              name="Owner Name"
              left_pad="0"
-- 
cgit v1.2.3


From 843db677d1706febf9765e1e6187a8c0b597bf98 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 18 Jul 2012 16:25:05 -0700
Subject: Setting the description column of the linkset floater to be a fixed
 width.  Having multiple dynamic width columns apparently prevents other
 columns from being manually resized by the user.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
index ef3ba25867..4c6c14f8bf 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -184,7 +184,7 @@
       <scroll_list.columns
           label="Description (root prim)"
           name="description"
-          dynamic_width="true" />
+          width="158" />
       <scroll_list.columns
           label="Owner"
           name="owner"
-- 
cgit v1.2.3


From b8cca9c6e66fa761fa104645effb1b672a8a99ae Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 24 Jul 2012 17:50:24 -0700
Subject: Adding a group identifier to the group objects in the pathfinding
 linksets and characters floaters.

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

(limited to 'indra/newview/skins')

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 abe918bfbe..46ee113b69 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -24,7 +24,8 @@
   <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>
+  <floater.string name="character_owner_unknown">[Unknown]</floater.string>
+  <floater.string name="character_owner_group">[group]</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 4c6c14f8bf..eaed92ac55 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -28,7 +28,8 @@
   <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_owner_unknown">[Unknown]</floater.string>
+  <floater.string name="linkset_owner_group">[group]</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>
-- 
cgit v1.2.3