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