From a4da61ae0be02353bd8108a7d967120fd023616b Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Fri, 15 May 2015 02:07:35 -0400 Subject: [PATCH] Ease up enable_move and enable_rotate restrictions in object tab of build tools. Also cleans up duplicate logic Explanation and Justification: Move permission is needed to rotate and move Move and rotate are actions you can perform via manip tools on attached linked prims already This just enables the GUI controls for something that was already doable via other means such as mouse. --- indra/newview/llpanelobject.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 09cf6f784..e7123d523 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -465,10 +465,10 @@ void LLPanelObject::getState( ) return; } - // can move or rotate only linked group with move permissions, or sub-object with move and modify perms - BOOL enable_move = objectp->permMove() && !objectp->isPermanentEnforced() && ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) && ( (objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts")); - BOOL enable_scale = objectp->permMove() && !objectp->isPermanentEnforced() && ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) && objectp->permModify(); - BOOL enable_rotate = objectp->permMove() && !objectp->isPermanentEnforced() && ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) && ( (objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts")); + // can move or rotate only linked group with move permissions + BOOL enable_move = objectp->permMove() && !objectp->isPermanentEnforced() && ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()); + BOOL enable_scale = enable_move && objectp->permModify(); + BOOL enable_rotate = enable_move; S32 selected_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount(); BOOL single_volume = (LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME ))