diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-03 05:50:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-03 05:50:31 -0400 |
| commit | e575a0ef04ed35ccdf4c0de50baecfc460b6c707 (patch) | |
| tree | 927c3e9304edb7408eb81c1c1a591fa978db1b79 /indra/newview/llviewermenu.cpp | |
| parent | d59715d6f1028f86827f1bd7b43c29abe697fcc9 (diff) | |
| parent | 770d8b0d01d3dabeccded0df3a06058f6196d829 (diff) | |
merge up to latest pathfinding project viewer
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index bcec9c6eda..06ffd2df92 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 @@ -7086,8 +7086,8 @@ BOOL enable_save_into_inventory(void*) return TRUE; } } -#endif return FALSE; +#endif } class LLToolsEnableSaveToInventory : public view_listener_t |