diff options
| author | James Cook <james@lindenlab.com> | 2009-12-01 15:01:57 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-01 15:01:57 -0800 |
| commit | b79afea3d058d3ad4c5a347bc71f6b50b42eb65d (patch) | |
| tree | e2bf00e81b1667110ef0997efeba878e588ae70c /indra/newview/llviewermenu.cpp | |
| parent | ef92508aa1679b713661aeb0cabba1a97501d874 (diff) | |
| parent | db9f74d55074d6f814783815a803d81238af507a (diff) | |
merge
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 4307002980..34d07f3284 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6221,6 +6221,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); } |