diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-04-27 17:20:42 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-04-27 17:20:42 -0700 |
| commit | de91f1e8902fddb378788fae6fc7f8aff4c264d0 (patch) | |
| tree | e321385ffe445262dec65e019d78048fe7cf487d /indra/newview | |
| parent | 932921766740655de84108970095ca17d24c5829 (diff) | |
PATH-552: BUGFIX Allowing the return of objects regardless of their permanent status. This should now match the server's functionality.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 2ed1975146..93f3e3f029 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -4143,10 +4143,7 @@ static bool get_derezzable_objects( break; case DRD_RETURN_TO_OWNER: - if (!object->isPermanentEnforced() || gAgent.isGodlike()) - { - can_derez_current = TRUE; - } + can_derez_current = TRUE; break; default: |