diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-12-08 11:50:26 +0200 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-12-08 11:50:26 +0200 |
| commit | c467e4193943522077d2418c864b0ab831390fc2 (patch) | |
| tree | 695784737995a416bab5767167d2eda9f392286b /indra/newview/llviewermenu.cpp | |
| parent | e1134e04eba2d6a29d0f3212d4acde84fc0a4097 (diff) | |
MAINT-1662 FIXED Disable menu items for attached objects.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rwxr-xr-x | indra/newview/llviewermenu.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 642a6e2a69..b39a5bf9da 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -4358,7 +4358,10 @@ static bool get_derezzable_objects( break; case DRD_RETURN_TO_OWNER: - can_derez_current = TRUE; + if(!object->isAttachment()) + { + can_derez_current = TRUE; + } break; default: @@ -4766,7 +4769,7 @@ BOOL enable_take() && object->permModify()) || (node->mPermissions->getOwner() == gAgent.getID()))) { - return TRUE; + return !object->isAttachment(); } #endif } |