Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ease up enable_move and enable_rotate restrictions in object tab of build tools.

Browse Source 
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.
This commit is contained in:
Inusaito Sayori
2015-05-15 02:07:35 -04:00
parent 580a7a4599
commit a4da61ae0b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llpanelobject.cpp
View File

@@ -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 ))