diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-01 15:53:26 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-12-01 15:53:26 -0500 |
| commit | de6222a56d1723729610be5d9601640ce425e778 (patch) | |
| tree | 8557c8158f22f654ba08acb9416795db385f3dec /indra/newview/llviewermenu.cpp | |
| parent | 57bc7dc44f31ef132a4abec228459c490c425eed (diff) | |
EXT-2719 - put on menu now gets disabled if the object is locked
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 8bcf2c6281..5863bda035 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6216,6 +6216,7 @@ BOOL object_selected_and_point_valid() return (selection->getRootObjectCount() == 1) && (selection->getFirstRootObject()->getPCode() == LL_PCODE_VOLUME) && selection->getFirstRootObject()->permYouOwner() && + selection->getFirstRootObject()->flagObjectMove() && !((LLViewerObject*)selection->getFirstRootObject()->getRoot())->isAvatar() && (selection->getFirstRootObject()->getNVPair("AssetContainer") == NULL); } |