1 files changed, 50 insertions, 78 deletions

diff --git a/linden/indra/newview/llmaniprotate.cpp b/linden/indra/newview/llmaniprotate.cpp
index 93cbfe4..452e4d4 100644
--- a/linden/indra/newview/llmaniprotate.cpp
+++ b/linden/indra/newview/llmaniprotate.cpp
@@ -81,7 +81,6 @@ const F32 SELECTED_MANIPULATOR_SCALE = 1.05f;
 const F32 MANIPULATOR_SCALE_HALF_LIFE = 0.07f;
 
 extern void handle_reset_rotation(void*);  // in LLViewerWindow
-extern void handle_first_tool(void*);
 
 LLManipRotate::LLManipRotate( LLToolComposite* composite )
 :       LLManip( "Rotate", composite ),
@@ -108,6 +107,7 @@ void LLManipRotate::handleSelect()
         // *FIX: put this in mouseDown?
         gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
         gFloaterTools->setStatusText("Drag colored bands to rotate object");
+        LLManip::handleSelect();
 }
 
 void LLManipRotate::handleDeselect()
@@ -116,6 +116,7 @@ void LLManipRotate::handleDeselect()
         mManipPart = LL_NO_PART;
 
         gFloaterTools->setStatusText("");
+        LLManip::handleDeselect();
 }
 
 void LLManipRotate::render()
@@ -127,7 +128,7 @@ void LLManipRotate::render()
         LLGLEnable gls_alpha_test(GL_ALPHA_TEST);
         
         // You can rotate if you can move
-        LLViewerObject* first_object = gSelectMgr->getFirstMoveableObject(TRUE);
+        LLViewerObject* first_object = mObjectSelection->getFirstMoveableObject(TRUE);
         if( !first_object )
         {
                 return;
@@ -140,7 +141,7 @@ void LLManipRotate::render()
 
         glMatrixMode(GL_MODELVIEW);
         glPushMatrix();
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
         {
                 F32 zoom = gAgent.getAvatarObject()->mHUDCurZoom;
                 glScalef(zoom, zoom, zoom);
@@ -358,7 +359,7 @@ BOOL LLManipRotate::handleMouseDown(S32 x, S32 y, MASK mask)
 {
         BOOL    handled = FALSE;
 
-        LLViewerObject* first_object = gSelectMgr->getFirstMoveableObject(TRUE);
+        LLViewerObject* first_object = mObjectSelection->getFirstMoveableObject(TRUE);
         if( first_object )
         {
                 LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
@@ -374,10 +375,10 @@ 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 = gSelectMgr->getObjectCount() != 0;
-        for (LLViewerObject* objectp = gSelectMgr->getFirstObject();
+        BOOL can_rotate = mObjectSelection->getObjectCount() != 0;
+        for (LLViewerObject* objectp = mObjectSelection->getFirstObject();
                 objectp;
-                objectp = gSelectMgr->getNextObject())
+                objectp = mObjectSelection->getNextObject())
         {
                 can_rotate = can_rotate && objectp->permMove() && (objectp->permModify() || gSavedSettings.getBOOL("SelectLinkedSet"));
         }
@@ -463,11 +464,7 @@ BOOL LLManipRotate::handleMouseUp(S32 x, S32 y, MASK mask)
         mManipPart = LL_NO_PART;
 
         // Might have missed last update due to timing.
-        if (mSendUpdateOnMouseUp)
-        {
-                gSelectMgr->sendMultipleUpdate( UPD_ROTATION | UPD_POSITION );
-                mSendUpdateOnMouseUp = FALSE;
-        }
+        gSelectMgr->sendMultipleUpdate( UPD_ROTATION | UPD_POSITION );
         gSelectMgr->enableSilhouette(TRUE);
         //gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
 
@@ -482,7 +479,7 @@ BOOL LLManipRotate::handleHover(S32 x, S32 y, MASK mask)
 {
         if( hasMouseCapture() )
         {
-                if( gSelectMgr->isEmpty() )
+                if( mObjectSelection->isEmpty() )
                 {
                         // Somehow the object got deselected while we were dragging it.
                         setMouseCapture( FALSE );
@@ -523,12 +520,6 @@ extern U32 gFrameCount;
 // Freeform rotation
 void LLManipRotate::drag( S32 x, S32 y )
 {
-        static LLTimer  update_timer;
-        F32 elapsed_time = update_timer.getElapsedTimeF32();
-        const F32 UPDATE_DELAY = 0.1f;                                          //  min time between transmitted updates
-        BOOL send_rotation_update = FALSE;
-        BOOL send_position_update = FALSE;
-
         if( !updateVisiblity() )
         {
                 return;
@@ -548,9 +539,8 @@ void LLManipRotate::drag( S32 x, S32 y )
 
         LLViewerObject* object;
         LLSelectNode* selectNode;
-        BOOL using_linked_selection = gSavedSettings.getBOOL("SelectLinkedSet");
 
-        for( selectNode = gSelectMgr->getFirstNode(); selectNode != NULL; selectNode = gSelectMgr->getNextNode() )
+        for( selectNode = mObjectSelection->getFirstNode(); selectNode != NULL; selectNode = mObjectSelection->getNextNode() )
         {
                 object = selectNode->getObject();
 
@@ -595,12 +585,6 @@ void LLManipRotate::drag( S32 x, S32 y )
                                 rebuild(object);
                         }
 
-                        // don't send updates all the time for sub-objects
-                        if (using_linked_selection && object->getRenderRotation() != new_rot)
-                        {
-                                send_rotation_update = TRUE;
-                        }
-
                         // for individually selected roots, we need to counterrotate all the children
                         if (object->isRootEdit() && selectNode->mIndividualSelection)
                         {
@@ -622,7 +606,7 @@ void LLManipRotate::drag( S32 x, S32 y )
         }
 
         // update positions
-        for( selectNode = gSelectMgr->getFirstNode(); selectNode != NULL; selectNode = gSelectMgr->getNextNode() )
+        for( selectNode = mObjectSelection->getFirstNode(); selectNode != NULL; selectNode = mObjectSelection->getNextNode() )
         {
                 object = selectNode->getObject();
                 
@@ -692,11 +676,6 @@ void LLManipRotate::drag( S32 x, S32 y )
                                 }
                         }
 
-                        if (using_linked_selection && object->getPositionAgent() != new_position)
-                        {
-                                send_position_update = TRUE;
-                        }
-
                         // for individually selected roots, we need to counter-translate all unselected children
                         if (object->isRootEdit() && selectNode->mIndividualSelection)
                         {
@@ -727,27 +706,19 @@ void LLManipRotate::drag( S32 x, S32 y )
                 }
         }
 
-        if ((send_position_update || send_rotation_update) && (elapsed_time > UPDATE_DELAY))
+        // store changes to override updates
+        for (LLSelectNode* selectNode = gSelectMgr->getSelection()->getFirstNode();
+                 selectNode != NULL;
+                 selectNode = gSelectMgr->getSelection()->getNextNode())
         {
-                U32 flag = UPD_NONE;
-                if (send_rotation_update) 
-                {
-                        flag |= UPD_ROTATION;
-                }
-                if (send_position_update) 
+                LLViewerObject*cur = selectNode->getObject();
+                if( cur->permModify() && cur->permMove() && !cur->isAvatar())
                 {
-                        flag |= UPD_POSITION;
+                        selectNode->mLastRotation = cur->getRotation();
+                        selectNode->mLastPositionLocal = cur->getPosition();
                 }
+        }       
 
-                gSelectMgr->sendMultipleUpdate( flag );
-                update_timer.reset();
-                mSendUpdateOnMouseUp = FALSE;
-        }
-        else
-        {
-                mSendUpdateOnMouseUp = TRUE;
-        }
-        
         gSelectMgr->updateSelectionCenter();
 
         // RN: just clear focus so camera doesn't follow spurious object updates
@@ -785,7 +756,7 @@ void LLManipRotate::renderSnapGuides()
 
         LLVector3 center = gAgent.getPosAgentFromGlobal( mRotationCenter );
         LLVector3 cam_at_axis;
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
         {
                 cam_at_axis.setVec(1.f, 0.f, 0.f);
         }
@@ -799,7 +770,7 @@ void LLManipRotate::renderSnapGuides()
         LLVector3 test_axis = constraint_axis;
 
         BOOL constrain_to_ref_object = FALSE;
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject())
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject())
         {
                 test_axis = test_axis * ~grid_rotation;
         }
@@ -826,7 +797,7 @@ void LLManipRotate::renderSnapGuides()
         }
 
         LLVector3 projected_snap_axis = world_snap_axis;
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject())
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject())
         {
                 projected_snap_axis = projected_snap_axis * grid_rotation;
         }
@@ -966,32 +937,32 @@ void LLManipRotate::renderSnapGuides()
                                         {
                                                 if (i == 0)
                                                 {
-                                                        renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Forward" : "East", LLColor4::white);
+                                                        renderTickText(text_point, mObjectSelection->isAttachment() ? "Forward" : "East", LLColor4::white);
                                                 }
                                                 else if (i == 16)
                                                 {
                                                         if (constraint_axis.mV[VZ] > 0.f)
                                                         {
-                                                                renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Left" : "North", LLColor4::white);
+                                                                renderTickText(text_point, mObjectSelection->isAttachment() ? "Left" : "North", LLColor4::white);
                                                         }
                                                         else
                                                         {
-                                                                renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Right" : "South", LLColor4::white);
+                                                                renderTickText(text_point, mObjectSelection->isAttachment() ? "Right" : "South", LLColor4::white);
                                                         }
                                                 }
                                                 else if (i == 32)
                                                 {
-                                                        renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Back" : "West", LLColor4::white);
+                                                        renderTickText(text_point, mObjectSelection->isAttachment() ? "Back" : "West", LLColor4::white);
                                                 }
                                                 else
                                                 {
                                                         if (constraint_axis.mV[VZ] > 0.f)
                                                         {
-                                                                renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Right" : "South", LLColor4::white);
+                                                                renderTickText(text_point, mObjectSelection->isAttachment() ? "Right" : "South", LLColor4::white);
                                                         }
                                                         else
                                                         {
-                                                                renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Left" : "North", LLColor4::white);
+                                                                renderTickText(text_point, mObjectSelection->isAttachment() ? "Left" : "North", LLColor4::white);
                                                         }
                                                 }
                                         }
@@ -999,7 +970,7 @@ void LLManipRotate::renderSnapGuides()
                                         {
                                                 if (i == 0)
                                                 {
-                                                        renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Left" : "North", LLColor4::white);
+                                                        renderTickText(text_point, mObjectSelection->isAttachment() ? "Left" : "North", LLColor4::white);
                                                 }
                                                 else if (i == 16)
                                                 {
@@ -1014,7 +985,7 @@ void LLManipRotate::renderSnapGuides()
                                                 }
                                                 else if (i == 32)
                                                 {
-                                                        renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Right" : "South", LLColor4::white);
+                                                        renderTickText(text_point, mObjectSelection->isAttachment() ? "Right" : "South", LLColor4::white);
                                                 }
                                                 else
                                                 {
@@ -1038,11 +1009,11 @@ void LLManipRotate::renderSnapGuides()
                                                 {
                                                         if (constraint_axis.mV[VY] > 0.f)
                                                         {
-                                                                renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Forward" : "East", LLColor4::white);
+                                                                renderTickText(text_point, mObjectSelection->isAttachment() ? "Forward" : "East", LLColor4::white);
                                                         }
                                                         else
                                                         {
-                                                                renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Back" : "West", LLColor4::white);
+                                                                renderTickText(text_point, mObjectSelection->isAttachment() ? "Back" : "West", LLColor4::white);
                                                         }
                                                 }
                                                 else if (i == 32)
@@ -1053,11 +1024,11 @@ void LLManipRotate::renderSnapGuides()
                                                 {
                                                         if (constraint_axis.mV[VY] > 0.f)
                                                         {
-                                                                renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Back" : "West", LLColor4::white);
+                                                                renderTickText(text_point, mObjectSelection->isAttachment() ? "Back" : "West", LLColor4::white);
                                                         }
                                                         else
                                                         {
-                                                                renderTickText(text_point, gSelectMgr->selectionIsAttachment() ? "Forward" : "East", LLColor4::white);
+                                                                renderTickText(text_point, mObjectSelection->isAttachment() ? "Forward" : "East", LLColor4::white);
                                                         }
                                                 }
                                         }
@@ -1072,7 +1043,7 @@ void LLManipRotate::renderSnapGuides()
                                 getObjectAxisClosestToMouse(object_axis);
 
                                 // project onto constraint plane
-                                LLSelectNode* first_node = gSelectMgr->getFirstMoveableNode(TRUE);
+                                LLSelectNode* first_node = mObjectSelection->getFirstMoveableNode(TRUE);
                                 object_axis = object_axis * first_node->getObject()->getRenderRotation();
                                 object_axis = object_axis - (object_axis * getConstraintAxis()) * getConstraintAxis();
                                 object_axis.normVec();
@@ -1156,7 +1127,7 @@ BOOL LLManipRotate::updateVisiblity()
         BOOL visible = FALSE;
 
         LLVector3 center = gAgent.getPosAgentFromGlobal( mRotationCenter );
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
         {
                 mCenterToCam = LLVector3(-1.f / gAgent.getAvatarObject()->mHUDCurZoom, 0.f, 0.f);
                 mCenterToCamNorm = mCenterToCam;
@@ -1265,7 +1236,7 @@ LLQuaternion LLManipRotate::dragUnconstrained( S32 x, S32 y )
                 F32 angle = (-1.f + dist_to_intersection / dist_to_tangent_point) * in_sphere_angle;
 
                 LLVector3 axis;
-                if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+                if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
                 {
                         axis = LLVector3(-1.f, 0.f, 0.f) % profile_center_to_intersection;
                 }
@@ -1308,7 +1279,7 @@ LLVector3 LLManipRotate::getConstraintAxis()
 
                 gSelectMgr->getGrid(grid_origin, grid_rotation, grid_scale);
 
-                LLSelectNode* first_node = gSelectMgr->getFirstMoveableNode(TRUE);
+                LLSelectNode* first_node = mObjectSelection->getFirstMoveableNode(TRUE);
                 if (first_node)
                 {
                         // *FIX: get agent local attachment grid working
@@ -1322,7 +1293,7 @@ LLVector3 LLManipRotate::getConstraintAxis()
 
 LLQuaternion LLManipRotate::dragConstrained( S32 x, S32 y )
 {
-        LLSelectNode* first_object_node = gSelectMgr->getFirstMoveableNode(TRUE);
+        LLSelectNode* first_object_node = mObjectSelection->getFirstMoveableNode(TRUE);
         LLVector3 constraint_axis = getConstraintAxis();
         LLVector3 center = gAgent.getPosAgentFromGlobal( mRotationCenter );
 
@@ -1339,7 +1310,7 @@ LLQuaternion LLManipRotate::dragConstrained( S32 x, S32 y )
         LLVector3 axis2;
 
         LLVector3 test_axis = constraint_axis;
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject())
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject())
         {
                 test_axis = test_axis * ~grid_rotation;
         }
@@ -1363,7 +1334,7 @@ LLQuaternion LLManipRotate::dragConstrained( S32 x, S32 y )
                 axis1 = LLVector3::x_axis;
         }
 
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject())
+        if (mObjectSelection->getSelectType() == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject())
         {
                 axis1 = axis1 * grid_rotation;
         }
@@ -1385,7 +1356,7 @@ LLQuaternion LLManipRotate::dragConstrained( S32 x, S32 y )
                 // We're looking at the ring edge-on.
                 LLVector3 snap_plane_center = (center + (constraint_axis * mRadiusMeters * 0.5f));
                 LLVector3 cam_to_snap_plane;
-                if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+                if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
                 {
                         cam_to_snap_plane.setVec(1.f, 0.f, 0.f);
                 }
@@ -1435,7 +1406,7 @@ LLQuaternion LLManipRotate::dragConstrained( S32 x, S32 y )
                 {
                         // try other plane
                         snap_plane_center = (center - (constraint_axis * mRadiusMeters * 0.5f));
-                        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+                        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
                         {
                                 cam_to_snap_plane.setVec(1.f, 0.f, 0.f);
                         }
@@ -1482,7 +1453,7 @@ LLQuaternion LLManipRotate::dragConstrained( S32 x, S32 y )
                 if (snap_plane > 0)
                 {
                         LLVector3 cam_at_axis;
-                        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+                        if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
                         {
                                 cam_at_axis.setVec(1.f, 0.f, 0.f);
                         }
@@ -1680,9 +1651,10 @@ LLVector3 LLManipRotate::intersectRayWithSphere( const LLVector3& ray_pt, const
 }
 
 // Utility function.  Should probably be moved to another class.
+//static
 void LLManipRotate::mouseToRay( S32 x, S32 y, LLVector3* ray_pt, LLVector3* ray_dir )
 {
-        if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+        if (gSelectMgr->getSelection()->getSelectType() == SELECT_TYPE_HUD)
         {
                 F32 mouse_x = (((F32)x / gViewerWindow->getWindowWidth()) - 0.5f) / gAgent.getAvatarObject()->mHUDCurZoom;
                 F32 mouse_y = ((((F32)y) / gViewerWindow->getWindowHeight()) - 0.5f) / gAgent.getAvatarObject()->mHUDCurZoom;
@@ -1704,7 +1676,7 @@ void LLManipRotate::highlightManipulators( S32 x, S32 y )
         mHighlightedPart = LL_NO_PART;
 
         //LLBBox bbox = gSelectMgr->getBBoxOfSelection();
-        LLViewerObject *first_object = gSelectMgr->getFirstMoveableObject(TRUE);
+        LLViewerObject *first_object = mObjectSelection->getFirstMoveableObject(TRUE);
         
         if (!first_object)
         {
@@ -1840,7 +1812,7 @@ void LLManipRotate::highlightManipulators( S32 x, S32 y )
 
 S32 LLManipRotate::getObjectAxisClosestToMouse(LLVector3& object_axis)
 {
-        LLSelectNode* first_object_node = gSelectMgr->getFirstMoveableNode(TRUE);
+        LLSelectNode* first_object_node = mObjectSelection->getFirstMoveableNode(TRUE);
 
         if (!first_object_node)
         {