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