From de91f1e8902fddb378788fae6fc7f8aff4c264d0 Mon Sep 17 00:00:00 2001 From: Todd Stinson Date: Fri, 27 Apr 2012 17:20:42 -0700 Subject: PATH-552: BUGFIX Allowing the return of objects regardless of their permanent status. This should now match the server's functionality. --- indra/newview/llviewermenu.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'indra/newview') 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: -- cgit v1.2.3