Path-702: Added notification message and hooked up onparcelclick.

3 files changed, 19 insertions, 10 deletions

diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index 6d1b6f89f6..db7371d993 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -341,8 +341,9 @@ LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
 	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] = LLUICtrlFactory::create<LLIconCtrl>(pathfinding_dynamic_icon);
-	addChild(mParcelIcon[PATHFINDING_DYNAMIC]);
+	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]);
 
 	LLTextBox::Params damage_text = p.damage_text;
 	damage_text.tool_tip = LLTrans::getString("LocationCtrlDamageTooltip");
@@ -826,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 = true;// gAgent.getRegion()->dynamicPathfindingEnabled();
+		bool pathfinding_dynamic = gAgent.getRegion()->dynamicPathfindingEnabled();
 
 		// Most icons are "block this ability"
 		mParcelIcon[VOICE_ICON]->setVisible(   !allow_voice );
@@ -835,8 +836,7 @@ void LLLocationInputCtrl::refreshParcelIcons()
 		mParcelIcon[BUILD_ICON]->setVisible(   !allow_build );
 		mParcelIcon[SCRIPTS_ICON]->setVisible( !allow_scripts );
 		mParcelIcon[DAMAGE_ICON]->setVisible(  allow_damage );
-		//prep#
-		mParcelIcon[PATHFINDING_DYNAMIC]->setVisible( pathfinding_dynamic );
+		mParcelIcon[PATHFINDING_DYNAMIC_ICON]->setVisible( pathfinding_dynamic );
 
 		mDamageText->setVisible(allow_damage);
 		mParcelIcon[SEE_AVATARS_ICON]->setVisible( !see_avs );
@@ -1176,6 +1176,9 @@ void LLLocationInputCtrl::onParcelIconClick(EParcelIcon icon)
 	case BUILD_ICON:
 		LLNotificationsUtil::add("NoBuild");
 		break;
+	case PATHFINDING_DYNAMIC_ICON:
+		LLNotificationsUtil::add("PathfindingDynamic");
+		break;
 	case SCRIPTS_ICON:
 	{
 		LLViewerRegion* region = gAgent.getRegion();
@@ -1199,9 +1202,6 @@ void LLLocationInputCtrl::onParcelIconClick(EParcelIcon icon)
 	case SEE_AVATARS_ICON:
 		LLNotificationsUtil::add("SeeAvatars");
 		break;
-	case PATHFINDING_DYNAMIC:
-		// prep TODO : add something here
-		break;
 	case ICON_COUNT:
 		break;
 	// no default to get compiler warning when a new icon gets added
diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h
index e007369310..e219d4ac5d 100644
--- a/indra/newview/lllocationinputctrl.h
+++ b/indra/newview/lllocationinputctrl.h
@@ -117,7 +117,7 @@ private:
 		SCRIPTS_ICON,		// 4
 		DAMAGE_ICON,		// 5
 		SEE_AVATARS_ICON,   // 6
-		PATHFINDING_DYNAMIC,// 7
+		PATHFINDING_DYNAMIC_ICON,// 7
 		ICON_COUNT			// 8 total
 	};
 
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"