diff options
| author | Igor Borovkov <iborovkov@productengine.com> | 2009-12-18 17:41:01 +0200 |
|---|---|---|
| committer | Igor Borovkov <iborovkov@productengine.com> | 2009-12-18 17:41:01 +0200 |
| commit | 5dfc8d4c84d2f3d14b08988f2af4e5b14fc47a72 (patch) | |
| tree | 3d757eca2107a93db7ad6d87b9b5068d90d566d9 /indra/newview/llviewermenu.cpp | |
| parent | f7fadaa807a0652df1da41ac69ab069273605965 (diff) | |
| parent | a09c2ba7ac798386b462745774d01c75102beaaf (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 03a6b193dc..93c4c3880e 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -639,6 +639,20 @@ class LLAdvancedCheckHUDInfo : public view_listener_t } }; + +////////////// +// FLYING // +////////////// + +class LLAdvancedAgentFlyingInfo : public view_listener_t +{ + bool handleEvent(const LLSD&) + { + return gAgent.getFlying(); + } +}; + + /////////////////////// // CLEAR GROUP CACHE // /////////////////////// @@ -2646,7 +2660,7 @@ bool enable_object_edit() enable = LLViewerParcelMgr::getInstance()->allowAgentBuild() || LLSelectMgr::getInstance()->getSelection()->isAttachment(); } - else if (LLSelectMgr::getInstance()->selectGetModify()) + else if (LLSelectMgr::getInstance()->selectGetAllValidAndObjectsFound()) { enable = true; } @@ -7709,6 +7723,9 @@ void initialize_menus() // Advanced Other Settings view_listener_t::addMenu(new LLAdvancedClearGroupCache(), "Advanced.ClearGroupCache"); + // Advanced > Shortcuts + view_listener_t::addMenu(new LLAdvancedAgentFlyingInfo(), "Agent.getFlying"); + // Advanced > Render > Types view_listener_t::addMenu(new LLAdvancedToggleRenderType(), "Advanced.ToggleRenderType"); view_listener_t::addMenu(new LLAdvancedCheckRenderType(), "Advanced.CheckRenderType"); |