diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-16 13:33:49 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-16 13:33:49 -0500 |
| commit | ee80fb64afc9725a12e37e14001a15542dc7ca3d (patch) | |
| tree | 29fe0d63995ea418e9aa1de8c950ecc6c4478d54 /indra/newview/llviewermenu.cpp | |
| parent | ace0be2a7c0665e382e47aeedfcffed7410e11a9 (diff) | |
| parent | 9813df87af1d895a3183eb33648009fd70ce6ed7 (diff) | |
merge with avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index dfa775c292..93702bf5dc 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2640,7 +2640,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; } |