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