1 files changed, 22 insertions, 8 deletions

diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h
index ed47ba73e3..cd6fd24077 100644..100755
--- a/indra/newview/lllocationinputctrl.h
+++ b/indra/newview/lllocationinputctrl.h
@@ -31,6 +31,7 @@
 #include "lliconctrl.h"		// Params
 #include "lltextbox.h"		// Params
 #include "lllocationhistory.h"
+#include "llpathfindingnavmesh.h"
 
 class LLLandmark;
 
@@ -40,6 +41,7 @@ class LLRemoveLandmarkObserver;
 class LLParcelChangeObserver;
 class LLMenuGL;
 class LLTeleportHistoryItem;
+class LLPathfindingNavMeshStatus;
 
 /**
  * Location input control.
@@ -78,7 +80,9 @@ public:
 											build_icon,
 											scripts_icon,
 											damage_icon,
-											see_avatars_icon;
+											see_avatars_icon,
+											pathfinding_dirty_icon,
+											pathfinding_disabled_icon;
 		Optional<LLTextBox::Params>			damage_text;
 		Params();
 	};
@@ -110,13 +114,15 @@ 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
-		ICON_COUNT			// 7 total
+		FLY_ICON,			      // 1
+		PUSH_ICON,			      // 2
+		BUILD_ICON,			      // 3
+		SCRIPTS_ICON,		      // 4
+		DAMAGE_ICON,		      // 5
+		SEE_AVATARS_ICON,         // 6
+		PATHFINDING_DIRTY_ICON,   // 7
+		PATHFINDING_DISABLED_ICON,// 8
+		ICON_COUNT			      // 9 total
 	};
 
 	friend class LLUICtrlFactory;
@@ -155,11 +161,15 @@ private:
 	void					onAddLandmarkButtonClicked();
 	void					onAgentParcelChange();
 	void					onMaturityButtonClicked();
+	void                    onRegionBoundaryCrossed();
+	void                    onNavMeshStatusChange(const LLPathfindingNavMeshStatus &pNavMeshStatus);
 	// callbacks
 	bool					onLocationContextMenuItemEnabled(const LLSD& userdata);
 	void 					onLocationContextMenuItemClicked(const LLSD& userdata);
 	void					onParcelIconClick(EParcelIcon icon);
 
+	void                    createNavMeshStatusListenerForCurrentRegion();
+
 	LLMenuGL*				mLocationContextMenu;
 	LLButton*				mAddLandmarkBtn;
 	LLButton*				mForSaleBtn;
@@ -179,11 +189,15 @@ private:
 	boost::signals2::connection	mParcelPropertiesControlConnection;
 	boost::signals2::connection	mParcelMgrConnection;
 	boost::signals2::connection	mLocationHistoryConnection;
+	boost::signals2::connection	mRegionCrossingSlot;
+	LLPathfindingNavMesh::navmesh_slot_t mNavMeshSlot;
+	bool mIsNavMeshDirty;
 	LLUIImage* mLandmarkImageOn;
 	LLUIImage* mLandmarkImageOff;
 	LLPointer<LLUIImage> mIconMaturityGeneral;
 	LLPointer<LLUIImage> mIconMaturityAdult;
 	LLPointer<LLUIImage> mIconMaturityModerate;
+	LLPointer<LLUIImage> mIconPathfindingDynamic;
 
 	std::string mAddLandmarkTooltip;
 	std::string mEditLandmarkTooltip;