diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-16 19:32:12 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-16 19:32:12 -0700 |
| commit | 803cb2bdec5e52b8442fb63a77edd5656ccf8f9c (patch) | |
| tree | 9ece18e50ee3af4570ca2c6a26b579cded34d095 | |
| parent | 8dbd1f5f48d5af605f73558091b2bab554ba49c2 (diff) | |
MAINT-1737: Removing the visibility check from the rebake navmesh menu option because it is does work well in the case of the torn-off menu mode.
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 17 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 2 |
2 files changed, 0 insertions, 19 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 66b09d8eb8..5a8ef00b1f 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -4908,22 +4908,6 @@ class LLToolsEnablePathfindingRebakeRegion : public view_listener_t } }; -class LLToolsVisiblePathfindingRebakeRegion : public view_listener_t -{ - bool handleEvent(const LLSD& userdata) - { - bool returnValue = false; - - if (LLPathfindingManager::getInstance() != NULL) - { - LLMenuOptionPathfindingRebakeNavmesh *rebakeInstance = LLMenuOptionPathfindingRebakeNavmesh::getInstance(); - returnValue = (rebakeInstance->canRebakeRegion() && - (rebakeInstance->getMode() != LLMenuOptionPathfindingRebakeNavmesh::kRebakeNavMesh_NotAvailable)); - } - return returnValue; - } -}; - // Round the position of all root objects to the grid class LLToolsSnapObjectXY : public view_listener_t { @@ -8409,7 +8393,6 @@ void initialize_menus() view_listener_t::addMenu(new LLToolsEnablePathfindingView(), "Tools.EnablePathfindingView"); view_listener_t::addMenu(new LLToolsDoPathfindingRebakeRegion(), "Tools.DoPathfindingRebakeRegion"); view_listener_t::addMenu(new LLToolsEnablePathfindingRebakeRegion(), "Tools.EnablePathfindingRebakeRegion"); - view_listener_t::addMenu(new LLToolsVisiblePathfindingRebakeRegion(), "Tools.VisiblePathfindingRebakeRegion"); // 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 abfaf75b7f..18932a32d0 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -991,8 +991,6 @@ function="Tools.DoPathfindingRebakeRegion"/> <menu_item_call.on_enable function="Tools.EnablePathfindingRebakeRegion" /> - <menu_item_call.on_visible - function="Tools.VisiblePathfindingRebakeRegion" /> </menu_item_call> </menu> |