diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-17 16:05:52 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-17 16:05:52 -0500 |
| commit | 49cb11010e2d705560cc988317cf7f228310a7bd (patch) | |
| tree | 60f9eee64038786b65ab05c32a174d7ed90d9add /indra/newview/llviewermenu.cpp | |
| parent | d3d454988a37a3f2d3175d10aa6ad44ef68fcaee (diff) | |
| parent | c3522ef0ce81830e467302c98ecc05397d7e0547 (diff) | |
automated merge avp->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 2e36971bf8..f1ae573c32 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2654,7 +2654,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; } |