Renaming the dynamic pathfinding icons to be better represent pathfinding disabled.

7 files changed, 27 insertions, 27 deletions

diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index 0d8526d3f1..0f299683a5 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -192,7 +192,7 @@ LLLocationInputCtrl::Params::Params()
 	damage_text("damage_text"),
 	see_avatars_icon("see_avatars_icon"),
 	maturity_help_topic("maturity_help_topic"),
-	pathfinding_dynamic_icon("pathfinding_dynamic_icon")
+	pathfinding_disabled_icon("pathfinding_disabled_icon")
 {
 }
 
@@ -338,12 +338,12 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 	mParcelIcon[DAMAGE_ICON]->setMouseDownCallback(boost::bind(&LLLocationInputCtrl::onParcelIconClick, this, DAMAGE_ICON));
 	addChild(mParcelIcon[DAMAGE_ICON]);
 
-	LLIconCtrl::Params pathfinding_dynamic_icon = p.pathfinding_dynamic_icon;
-	pathfinding_dynamic_icon.tool_tip = LLTrans::getString("PathfindingDynamicTooltip");
-	pathfinding_dynamic_icon.mouse_opaque = true;
-	mParcelIcon[PATHFINDING_DYNAMIC_ICON] = LLUICtrlFactory::create<LLIconCtrl>(pathfinding_dynamic_icon);
-	mParcelIcon[PATHFINDING_DYNAMIC_ICON]->setMouseDownCallback(boost::bind(&LLLocationInputCtrl::onParcelIconClick, this, PATHFINDING_DYNAMIC_ICON));
-	addChild(mParcelIcon[PATHFINDING_DYNAMIC_ICON]);
+	LLIconCtrl::Params pathfinding_disabled_icon = p.pathfinding_disabled_icon;
+	pathfinding_disabled_icon.tool_tip = LLTrans::getString("LocationCtrlPathfindingDisabledTooltip");
+	pathfinding_disabled_icon.mouse_opaque = true;
+	mParcelIcon[PATHFINDING_DISABLED_ICON] = LLUICtrlFactory::create<LLIconCtrl>(pathfinding_disabled_icon);
+	mParcelIcon[PATHFINDING_DISABLED_ICON]->setMouseDownCallback(boost::bind(&LLLocationInputCtrl::onParcelIconClick, this, PATHFINDING_DISABLED_ICON));
+	addChild(mParcelIcon[PATHFINDING_DISABLED_ICON]);
 
 	LLTextBox::Params damage_text = p.damage_text;
 	damage_text.tool_tip = LLTrans::getString("LocationCtrlDamageTooltip");
@@ -827,7 +827,7 @@ void LLLocationInputCtrl::refreshParcelIcons()
 		bool allow_scripts	= vpm->allowAgentScripts(agent_region, current_parcel);
 		bool allow_damage	= vpm->allowAgentDamage(agent_region, current_parcel);
 		bool see_avs        = current_parcel->getSeeAVs();
-		bool pathfinding_dynamic_enabled = gAgent.getRegion()->dynamicPathfindingEnabled();
+		bool pathfinding_dynamic_enabled = agent_region->dynamicPathfindingEnabled();
 
 		// Most icons are "block this ability"
 		mParcelIcon[VOICE_ICON]->setVisible(   !allow_voice );
@@ -836,7 +836,7 @@ void LLLocationInputCtrl::refreshParcelIcons()
 		mParcelIcon[BUILD_ICON]->setVisible(   !allow_build );
 		mParcelIcon[SCRIPTS_ICON]->setVisible( !allow_scripts );
 		mParcelIcon[DAMAGE_ICON]->setVisible(  allow_damage );
-		mParcelIcon[PATHFINDING_DYNAMIC_ICON]->setVisible( !pathfinding_dynamic_enabled );
+		mParcelIcon[PATHFINDING_DISABLED_ICON]->setVisible( !pathfinding_dynamic_enabled );
 
 		mDamageText->setVisible(allow_damage);
 		mParcelIcon[SEE_AVATARS_ICON]->setVisible( !see_avs );
@@ -1176,8 +1176,8 @@ void LLLocationInputCtrl::onParcelIconClick(EParcelIcon icon)
 	case BUILD_ICON:
 		LLNotificationsUtil::add("NoBuild");
 		break;
-	case PATHFINDING_DYNAMIC_ICON:
-		LLNotificationsUtil::add("PathfindingDynamic");
+	case PATHFINDING_DISABLED_ICON:
+		LLNotificationsUtil::add("DynamicPathfindingDisabled");
 		break;
 	case SCRIPTS_ICON:
 	{
diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h
index e219d4ac5d..14650c57b5 100644
--- a/indra/newview/lllocationinputctrl.h
+++ b/indra/newview/lllocationinputctrl.h
@@ -79,7 +79,7 @@ public:
 											scripts_icon,
 											damage_icon,
 											see_avatars_icon,
-											pathfinding_dynamic_icon;
+											pathfinding_disabled_icon;
 		Optional<LLTextBox::Params>			damage_text;
 		Params();
 	};
@@ -111,14 +111,14 @@ private:
 	enum EParcelIcon
 	{
 		VOICE_ICON = 0,
-		FLY_ICON,			// 1
-		PUSH_ICON,			// 2
-		BUILD_ICON,			// 3
-		SCRIPTS_ICON,		// 4
-		DAMAGE_ICON,		// 5
-		SEE_AVATARS_ICON,   // 6
-		PATHFINDING_DYNAMIC_ICON,// 7
-		ICON_COUNT			// 8 total
+		FLY_ICON,			      // 1
+		PUSH_ICON,			      // 2
+		BUILD_ICON,			      // 3
+		SCRIPTS_ICON,		      // 4
+		DAMAGE_ICON,		      // 5
+		SEE_AVATARS_ICON,         // 6
+		PATHFINDING_DISABLED_ICON,// 7
+		ICON_COUNT			      // 8 total
 	};
 
 	friend class LLUICtrlFactory;
diff --git a/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png b/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png
index 0622141848..0622141848 100644
--- a/indra/newview/skins/default/textures/icons/Pathfinding_Dynamic.png
+++ b/indra/newview/skins/default/textures/icons/Pathfinding_Disabled.png
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