PATH-492: BUGFIX Disabling the pathfinding submenu options on non-pathfinding enabled regions.

1 files changed, 12 insertions, 3 deletions

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index a8c6b6dcf5..2ed1975146 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -4801,11 +4801,19 @@ class LLToolsSaveToObjectInventory : public view_listener_t
 	}
 };
 
-class LLToolsEnableLinksets : public view_listener_t
+class LLToolsEnablePathfinding : public view_listener_t
 {
 	bool handleEvent(const LLSD& userdata)
 	{
-		return LLPathfindingManager::getInstance()->isAllowAlterPermanent();
+		return LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion();
+	}
+};
+
+class LLToolsEnablePathfindingLinksets : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		return LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion() && LLPathfindingManager::getInstance()->isAllowAlterPermanent();
 	}
 };
 
@@ -8196,7 +8204,8 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLToolsEnableSaveToInventory(), "Tools.EnableSaveToInventory");
 	view_listener_t::addMenu(new LLToolsEnableSaveToObjectInventory(), "Tools.EnableSaveToObjectInventory");
 
-	view_listener_t::addMenu(new LLToolsEnableLinksets(), "Tools.EnableLinksets");
+	view_listener_t::addMenu(new LLToolsEnablePathfinding(), "Tools.EnablePathfinding");
+	view_listener_t::addMenu(new LLToolsEnablePathfindingLinksets(), "Tools.EnablePathfindingLinksets");
 
 	// Help menu
 	// most items use the ShowFloater method