Second Life viewer sources 1.18.4.0-RC

1 files changed, 46 insertions, 29 deletions

diff --git a/linden/indra/newview/llmaniprotate.cpp b/linden/indra/newview/llmaniprotate.cpp
index 940e78a..fb3de3a 100644
--- a/linden/indra/newview/llmaniprotate.cpp
+++ b/linden/indra/newview/llmaniprotate.cpp
@@ -2,6 +2,8 @@
  * @file llmaniprotate.cpp
  * @brief LLManipRotate class implementation
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "llviewerprecompiledheaders.h"
@@ -107,7 +110,7 @@ void LLManipRotate::handleSelect()
 {
         // *FIX: put this in mouseDown?
         gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
-        gFloaterTools->setStatusText("Drag colored bands to rotate object");
+        gFloaterTools->setStatusText("rotate");
         LLManip::handleSelect();
 }
 
@@ -115,8 +118,6 @@ void LLManipRotate::handleDeselect()
 {
         mHighlightedPart = LL_NO_PART;
         mManipPart = LL_NO_PART;
-
-        gFloaterTools->setStatusText("");
         LLManip::handleDeselect();
 }
 
@@ -376,14 +377,7 @@ BOOL LLManipRotate::handleMouseDown(S32 x, S32 y, MASK mask)
 // Assumes that one of the parts of the manipulator was hit.
 BOOL LLManipRotate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
 {
-        BOOL can_rotate = mObjectSelection->getObjectCount() != 0;
-        for (LLViewerObject* objectp = mObjectSelection->getFirstObject();
-                objectp;
-                objectp = mObjectSelection->getNextObject())
-        {
-                can_rotate = can_rotate && objectp->permMove() && (objectp->permModify() || !gSavedSettings.getBOOL("EditLinkedParts"));
-        }
-
+        BOOL can_rotate = canAffectSelection();
         if (!can_rotate)
         {
                 return FALSE;
@@ -462,15 +456,18 @@ BOOL LLManipRotate::handleMouseUp(S32 x, S32 y, MASK mask)
         // first, perform normal processing in case this was a quick-click
         handleHover(x, y, mask);
 
-        mManipPart = LL_NO_PART;
+        if( hasMouseCapture() )
+        {
+                mManipPart = LL_NO_PART;
 
-        // Might have missed last update due to timing.
-        gSelectMgr->sendMultipleUpdate( UPD_ROTATION | UPD_POSITION );
-        gSelectMgr->enableSilhouette(TRUE);
-        //gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
+                // Might have missed last update due to timing.
+                gSelectMgr->sendMultipleUpdate( UPD_ROTATION | UPD_POSITION );
+                gSelectMgr->enableSilhouette(TRUE);
+                //gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
 
-        gSelectMgr->updateSelectionCenter();
-        gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
+                gSelectMgr->updateSelectionCenter();
+                gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
+        }
 
         return LLManip::handleMouseUp(x, y, mask);
 }
@@ -538,12 +535,11 @@ void LLManipRotate::drag( S32 x, S32 y )
         BOOL damped = mSmoothRotate;
         mSmoothRotate = FALSE;
 
-        LLViewerObject* object;
-        LLSelectNode* selectNode;
-
-        for( selectNode = mObjectSelection->getFirstNode(); selectNode != NULL; selectNode = mObjectSelection->getNextNode() )
+        for (LLObjectSelection::iterator iter = mObjectSelection->begin();
+                 iter != mObjectSelection->end(); iter++)
         {
-                object = selectNode->getObject();
+                LLSelectNode* selectNode = *iter;
+                LLViewerObject* object = selectNode->getObject();
 
                 // have permission to move and object is root of selection or individually selected
                 if (object->permMove() && (object->isRootEdit() || selectNode->mIndividualSelection))
@@ -607,10 +603,12 @@ void LLManipRotate::drag( S32 x, S32 y )
         }
 
         // update positions
-        for( selectNode = mObjectSelection->getFirstNode(); selectNode != NULL; selectNode = mObjectSelection->getNextNode() )
+        for (LLObjectSelection::iterator iter = mObjectSelection->begin();
+                 iter != mObjectSelection->end(); iter++)
         {
-                object = selectNode->getObject();
-                
+                LLSelectNode* selectNode = *iter;
+                LLViewerObject* object = selectNode->getObject();
+
                 // to avoid cumulative position changes we calculate the objects new position using its saved position
                 if (object && object->permMove())
                 {
@@ -708,10 +706,10 @@ void LLManipRotate::drag( S32 x, S32 y )
         }
 
         // store changes to override updates
-        for (LLSelectNode* selectNode = gSelectMgr->getSelection()->getFirstNode();
-                 selectNode != NULL;
-                 selectNode = gSelectMgr->getSelection()->getNextNode())
+        for (LLObjectSelection::iterator iter = gSelectMgr->getSelection()->begin();
+                 iter != gSelectMgr->getSelection()->end(); iter++)
         {
+                LLSelectNode* selectNode = *iter;
                 LLViewerObject*cur = selectNode->getObject();
                 if( cur->permModify() && cur->permMove() && !cur->isAvatar())
                 {
@@ -1866,3 +1864,22 @@ S32 LLManipRotate::getObjectAxisClosestToMouse(LLVector3& object_axis)
 
         return axis_index;
 }
+
+//virtual
+BOOL LLManipRotate::canAffectSelection()
+{
+        BOOL can_rotate = mObjectSelection->getObjectCount() != 0;
+        if (can_rotate)
+        {
+                struct f : public LLSelectedObjectFunctor
+                {
+                        virtual bool apply(LLViewerObject* objectp)
+                        {
+                                return objectp->permMove() && (objectp->permModify() || !gSavedSettings.getBOOL("EditLinkedParts"));
+                        }
+                } func;
+                can_rotate = mObjectSelection->applyToObjects(&func);
+        }
+        return can_rotate;
+}
+