diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-04-03 17:03:33 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-04-03 17:03:33 -0700 |
| commit | e364715a68f4d8384961d669ad6e7039e5c5d8b6 (patch) | |
| tree | 212f0feb53e1bc594acd54bf5d4bcc0a3c723077 /indra | |
| parent | 5d0d76572e2d5ce672b501a17bbe60ffabcf256e (diff) | |
PATH-470: BUGFIX Disabling the return menu option for permanent objects when in frozen mode.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index eafeaeb13f..a8c6b6dcf5 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -4134,15 +4134,19 @@ static bool get_derezzable_objects( { case DRD_TAKE_INTO_AGENT_INVENTORY: case DRD_TRASH: - if( (node->mPermissions->allowTransferTo(gAgent.getID()) && object->permModify()) - || (node->allowOperationOnNode(PERM_OWNER, GP_OBJECT_MANIPULATE)) ) + if (!object->isPermanentEnforced() && + ((node->mPermissions->allowTransferTo(gAgent.getID()) && object->permModify()) + || (node->allowOperationOnNode(PERM_OWNER, GP_OBJECT_MANIPULATE)))) { can_derez_current = TRUE; } break; case DRD_RETURN_TO_OWNER: - can_derez_current = TRUE; + if (!object->isPermanentEnforced() || gAgent.isGodlike()) + { + can_derez_current = TRUE; + } break; default: |