6 files changed, 3 insertions, 51 deletions
diff --git a/indra/newview/llfloaterpathfindinglinksets.cpp b/indra/newview/llfloaterpathfindinglinksets.cpp
index 1d7f165ad9..8488ee1aa3 100644
--- a/indra/newview/llfloaterpathfindinglinksets.cpp
+++ b/indra/newview/llfloaterpathfindinglinksets.cpp
@@ -60,26 +60,6 @@
 // LLFloaterPathfindingLinksets
 //---------------------------------------------------------------------------
 
-void LLFloaterPathfindingLinksets::onOpen(const LLSD& pKey)
-{
-	LLFloaterPathfindingObjects::onOpen(pKey);
-
-	if (!mAgentStateSlot.connected())
-	{
-		mAgentStateSlot = LLPathfindingManager::getInstance()->registerAgentStateListener(boost::bind(&LLFloaterPathfindingLinksets::onAgentStateChange, this, _1));
-	}
-}
-
-void LLFloaterPathfindingLinksets::onClose(bool pIsAppQuitting)
-{
-	if (mAgentStateSlot.connected())
-	{
-		mAgentStateSlot.disconnect();
-	}
-
-	LLFloaterPathfindingObjects::onClose(pIsAppQuitting);
-}
-
 void LLFloaterPathfindingLinksets::openLinksetsEditor()
 {
 	LLFloaterReg::toggleInstanceOrBringToFront("pathfinding_linksets");
@@ -107,8 +87,7 @@ LLFloaterPathfindingLinksets::LLFloaterPathfindingLinksets(const LLSD& pSeed)
 	mLabelEditD(NULL),
 	mEditD(NULL),
 	mApplyEditsButton(NULL),
-	mBeaconColor(),
-	mAgentStateSlot()
+	mBeaconColor()
 {
 }
 
@@ -337,11 +316,6 @@ void LLFloaterPathfindingLinksets::onApplyChangesClicked()
 	applyEdit();
 }
 
-void LLFloaterPathfindingLinksets::onAgentStateChange(LLPathfindingManager::EAgentState pAgentState)
-{
-	updateControls();
-}
-
 void LLFloaterPathfindingLinksets::applyFilters()
 {
 	rebuildObjectsScrollList();
@@ -530,7 +504,7 @@ bool LLFloaterPathfindingLinksets::isShowCannotBeVolumeWarning(LLPathfindingLink
 void LLFloaterPathfindingLinksets::updateStateOnEditFields()
 {
 	int numSelectedItems = getNumSelectedObjects();
-	bool isEditEnabled = ((numSelectedItems > 0) && LLPathfindingManager::getInstance()->isAllowAlterPermanent());
+	bool isEditEnabled = (numSelectedItems > 0);
 
 	mEditLinksetUse->setEnabled(isEditEnabled);
 
diff --git a/indra/newview/llfloaterpathfindinglinksets.h b/indra/newview/llfloaterpathfindinglinksets.h
index 4b19f09cda..8c464dc1d5 100644
--- a/indra/newview/llfloaterpathfindinglinksets.h
+++ b/indra/newview/llfloaterpathfindinglinksets.h
@@ -46,10 +46,6 @@ class LLVector3;
 class LLFloaterPathfindingLinksets : public LLFloaterPathfindingObjects
 {
 public:
-
-	virtual void onOpen(const LLSD& pKey);
-	virtual void onClose(bool pIsAppQuitting);
-
 	static void  openLinksetsEditor();
 
 protected:
@@ -78,7 +74,6 @@ private:
 	void onClearFiltersClicked();
 	void onWalkabilityCoefficientEntered(LLUICtrl *pUICtrl);
 	void onApplyChangesClicked();
-	void onAgentStateChange(LLPathfindingManager::EAgentState pAgentState);
 
 	void applyFilters();
 	void clearFilters();
@@ -131,8 +126,6 @@ private:
 	LLButton                                 *mApplyEditsButton;
 
 	LLColor4                                 mBeaconColor;
-
-	LLPathfindingManager::agent_state_slot_t mAgentStateSlot;
 };
 
 #endif // LL_LLFLOATERPATHFINDINGLINKSETS_H
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
index e282a3e2f4..5e2a9e1213 100644
--- a/indra/newview/llpathfindingmanager.cpp
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -292,11 +292,6 @@ bool LLPathfindingManager::isPathfindingNavMeshVersioningEnabledForCurrentRegion
 }
 #endif // DEPRECATED_UNVERSIONED_NAVMESH
 
-bool LLPathfindingManager::isAllowAlterPermanent()
-{
-	return (!isPathfindingEnabledForCurrentRegion() || (getAgentState() == kAgentStateUnfrozen));
-}
-
 bool LLPathfindingManager::isAllowViewTerrainProperties() const
 {
 	LLViewerRegion* region = getCurrentRegion();
diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h
index 3c9af91e7b..1ae6e06b40 100644
--- a/indra/newview/llpathfindingmanager.h
+++ b/indra/newview/llpathfindingmanager.h
@@ -80,7 +80,6 @@ public:
 	bool isPathfindingNavMeshVersioningEnabledForCurrentRegionXXX() const;
 #endif // DEPRECATED_UNVERSIONED_NAVMESH
 
-	bool isAllowAlterPermanent();
 	bool isAllowViewTerrainProperties() const;
 
 	LLPathfindingNavMesh::navmesh_slot_t registerNavMeshListenerForRegion(LLViewerRegion *pRegion, LLPathfindingNavMesh::navmesh_callback_t pNavMeshCallback);
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 6944ae1a9b..5a0239c2e4 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -4806,14 +4806,6 @@ class LLToolsEnablePathfinding : public view_listener_t
 	}
 };
 
-class LLToolsEnablePathfindingLinksets : public view_listener_t
-{
-	bool handleEvent(const LLSD& userdata)
-	{
-		return LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion() && LLPathfindingManager::getInstance()->isAllowAlterPermanent();
-	}
-};
-
 // Round the position of all root objects to the grid
 class LLToolsSnapObjectXY : public view_listener_t
 {
@@ -8209,7 +8201,6 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLToolsEnableSaveToObjectInventory(), "Tools.EnableSaveToObjectInventory");
 
 	view_listener_t::addMenu(new LLToolsEnablePathfinding(), "Tools.EnablePathfinding");
-	view_listener_t::addMenu(new LLToolsEnablePathfindingLinksets(), "Tools.EnablePathfindingLinksets");
 
 	// Help menu
 	// most items use the ShowFloater method
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index ad02beff7a..7b21f1f135 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -967,7 +967,7 @@
               function="Floater.ToggleOrBringToFront"
               parameter="pathfinding_linksets" />
           <menu_item_call.on_enable
-              function="Tools.EnablePathfindingLinksets" />
+              function="Tools.EnablePathfinding" />
         </menu_item_call>
         <menu_item_call
             label="Characters..."