diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-06-28 16:37:33 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-28 16:37:33 -0700 |
| commit | 1bf7c4b645fb2eb307b2fb9541175569c4d8bcea (patch) | |
| tree | 7eb9a49d5bce2ea137e40398f65a96a69ee478f1 /indra/newview | |
| parent | fcc810c67d251247c1c4f26dfe1dcde0450d7ad5 (diff) | |
Ensuring that the Show in Linksets and Show in Characters right-click menu option is only show on pathfinding-enabled regions.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index bcec9c6eda..7c289f43dd 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2804,12 +2804,12 @@ bool enable_object_build() bool enable_object_select_in_pathfinding_linksets() { - return LLSelectMgr::getInstance()->selectGetNonCharacter(); + return LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion() && LLSelectMgr::getInstance()->selectGetNonCharacter(); } bool enable_object_select_in_pathfinding_characters() { - return LLSelectMgr::getInstance()->selectGetCharacter(); + return LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion() && LLSelectMgr::getInstance()->selectGetCharacter(); } class LLSelfRemoveAllAttachments : public view_listener_t |