1 files changed, 254 insertions, 34 deletions

diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 366f770..e13d8ea 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -101,7 +101,6 @@ extern LLVector3d		gLastHitObjectOffset;
 //
 // Globals
 //
-LLSelectMgr* gSelectMgr = NULL;
 
 BOOL gDebugSelectMgr = FALSE;
 
@@ -157,8 +156,6 @@ static LLPointer<LLObjectSelection> sNullSelection;
 
 void LLSelectMgr::cleanupGlobals()
 {
-        delete gSelectMgr;
-        gSelectMgr = NULL;
         sNullSelection = NULL;
 }
 
@@ -507,7 +504,7 @@ BOOL LLSelectMgr::removeObjectFromSelections(const LLUUID &id)
         LLTool *tool = NULL;
         if (!gNoRender)
         {
-                tool = gToolMgr->getCurrentTool();
+                tool = LLToolMgr::getInstance()->getCurrentTool();
 
                 // It's possible that the tool is editing an object that is not selected
                 LLViewerObject* tool_editing_object = tool->getEditingObject();
@@ -1432,7 +1429,7 @@ void LLSelectMgr::selectionSetImage(const LLUUID& imageid)
                         {
                                 object->sendTEUpdate();
                                 // 1 particle effect per object                         
-                                LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
+                                LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE);
                                 effectp->setSourceObject(gAgent.getAvatarObject());
                                 effectp->setTargetObject(object);
                                 effectp->setDuration(LL_HUD_DUR_SHORT);
@@ -2787,28 +2784,28 @@ void LLSelectMgr::confirmDelete(S32 option, void* data)
                         LLUUID trash_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_TRASH);
                         // attempt to derez into the trash.
                         LLDeRezInfo* info = new LLDeRezInfo(DRD_TRASH, trash_id);
-                        gSelectMgr->sendListToRegions("DeRezObject",
+                        LLSelectMgr::getInstance()->sendListToRegions("DeRezObject",
                                                                                   packDeRezHeader,
                                                                                   packObjectLocalID,
                                                                                   (void*)info,
                                                                                   SEND_ONLY_ROOTS);
                         // VEFFECT: Delete Object - one effect for all deletes
-                        if (gSelectMgr->mSelectedObjects->mSelectType != SELECT_TYPE_HUD)
+                        if (LLSelectMgr::getInstance()->mSelectedObjects->mSelectType != SELECT_TYPE_HUD)
                         {
-                                LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)gHUDManager->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
-                                effectp->setPositionGlobal( gSelectMgr->getSelectionCenterGlobal() );
+                                LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
+                                effectp->setPositionGlobal( LLSelectMgr::getInstance()->getSelectionCenterGlobal() );
                                 effectp->setColor(LLColor4U(gAgent.getEffectColor()));
                                 F32 duration = 0.5f;
-                                duration += gSelectMgr->mSelectedObjects->getObjectCount() / 64.f;
+                                duration += LLSelectMgr::getInstance()->mSelectedObjects->getObjectCount() / 64.f;
                                 effectp->setDuration(duration);
                         }
 
                         gAgent.setLookAt(LOOKAT_TARGET_CLEAR);
 
                         // Keep track of how many objects have been deleted.
-                        F64 obj_delete_count = gViewerStats->getStat(LLViewerStats::ST_OBJECT_DELETE_COUNT);
-                        obj_delete_count += gSelectMgr->mSelectedObjects->getObjectCount();
-                        gViewerStats->setStat(LLViewerStats::ST_OBJECT_DELETE_COUNT, obj_delete_count );
+                        F64 obj_delete_count = LLViewerStats::getInstance()->getStat(LLViewerStats::ST_OBJECT_DELETE_COUNT);
+                        obj_delete_count += LLSelectMgr::getInstance()->mSelectedObjects->getObjectCount();
+                        LLViewerStats::getInstance()->setStat(LLViewerStats::ST_OBJECT_DELETE_COUNT, obj_delete_count );
                 }
                 break;
         case 1:
@@ -3360,6 +3357,36 @@ void LLSelectMgr::deselectAll()
         updatePointAt();
 }
 
+void LLSelectMgr::deselectAllForStandingUp()
+{
+        /*
+        This function is similar deselectAll() except for the first if statement
+        which was removed. This is needed as a workaround for DEV-2854
+        */
+
+        // Zap the angular velocity, as the sim will set it to zero
+        for (LLObjectSelection::iterator iter = mSelectedObjects->begin();
+                 iter != mSelectedObjects->end(); iter++ )
+        {
+                LLViewerObject *objectp = (*iter)->getObject();
+                objectp->setAngularVelocity( 0,0,0 );
+                objectp->setVelocity( 0,0,0 );
+        }
+
+        sendListToRegions(
+                "ObjectDeselect",
+                packAgentAndSessionID,
+                packObjectLocalID,
+                NULL,
+                SEND_INDIVIDUALS);
+
+        removeAll();
+        
+        mLastSentSelectionCenterGlobal.clearVec();
+
+        updatePointAt();
+}
+
 void LLSelectMgr::deselectUnused()
 {
         // no more outstanding references to this selection
@@ -3496,7 +3523,7 @@ void LLSelectMgr::sendAttach(U8 attachment_point)
                 return;
         }
 
-        BOOL build_mode = gToolMgr->inEdit();
+        BOOL build_mode = LLToolMgr::getInstance()->inEdit();
         // Special case: Attach to default location for this object.
         if (0 == attachment_point ||
                 get_if_there(gAgent.getAvatarObject()->mAttachmentPoints, (S32)attachment_point, (LLViewerJointAttachment*)NULL))
@@ -4283,7 +4310,7 @@ void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data
                                 return (node->getObject() && node->getObject()->mID == mID);
                         }
                 } func(id);
-                LLSelectNode* node = gSelectMgr->getSelection()->getFirstNode(&func);
+                LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstNode(&func);
 
                 if (node)
                 {
@@ -4426,7 +4453,7 @@ void LLSelectMgr::processObjectPropertiesFamily(LLMessageSystem* msg, void** use
                         return (node->getObject() && node->getObject()->mID == mID);
                 }
         } func(id);
-        LLSelectNode* node = gSelectMgr->getHoverObjects()->getFirstNode(&func);
+        LLSelectNode* node = LLSelectMgr::getInstance()->getHoverObjects()->getFirstNode(&func);
 
         if (node)
         {
@@ -4452,7 +4479,7 @@ void LLSelectMgr::processForceObjectSelect(LLMessageSystem* msg, void**)
 
         if (reset_list)
         {
-                gSelectMgr->deselectAll();
+                LLSelectMgr::getInstance()->deselectAll();
         }
 
         LLUUID full_id;
@@ -4478,7 +4505,7 @@ void LLSelectMgr::processForceObjectSelect(LLMessageSystem* msg, void**)
         }
 
         // Don't select, just highlight
-        gSelectMgr->highlightObjectAndFamily(objects);
+        LLSelectMgr::getInstance()->highlightObjectAndFamily(objects);
 }
 
 
@@ -4493,9 +4520,7 @@ void LLSelectMgr::updateSilhouettes()
 
         if (!mSilhouetteImagep)
         {
-                LLUUID id;
-                id.set( gViewerArt.getString("silhouette.tga") );
-                mSilhouetteImagep = gImageList.getImage(id, TRUE, TRUE);
+                mSilhouetteImagep = gImageList.getImageFromFile("silhouette.j2c", TRUE, TRUE);
         }
 
         mHighlightedObjects->cleanupNodes();
@@ -4547,7 +4572,7 @@ void LLSelectMgr::updateSilhouettes()
                                 {
                                         if (num_sils_genned++ < MAX_SILS_PER_FRAME)// && objectp->mDrawable->isVisible())
                                         {
-                                                generateSilhouette(node, gCamera->getOrigin());
+                                                generateSilhouette(node, LLViewerCamera::getInstance()->getOrigin());
                                                 changed_objects.push_back(objectp);
                                         }
                                         else if (objectp->isAttachment())
@@ -4712,7 +4737,7 @@ void LLSelectMgr::updateSilhouettes()
                                 {
                                         if (num_sils_genned++ < MAX_SILS_PER_FRAME)
                                         {
-                                                generateSilhouette(node, gCamera->getOrigin());
+                                                generateSilhouette(node, LLViewerCamera::getInstance()->getOrigin());
                                                 changed_objects.push_back(objectp);                     
                                         }
                                         else if (objectp->isAttachment() && objectp->getRootEdit()->mDrawable.notNull())
@@ -4782,7 +4807,7 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud)
                 glPushMatrix();
                 glLoadIdentity();
                 F32 depth = llmax(1.f, hud_bbox.getExtentLocal().mV[VX] * 1.1f);
-                glOrtho(-0.5f * gCamera->getAspect(), 0.5f * gCamera->getAspect(), -0.5f, 0.5f, 0.f, depth);
+                glOrtho(-0.5f * LLViewerCamera::getInstance()->getAspect(), 0.5f * LLViewerCamera::getInstance()->getAspect(), -0.5f, 0.5f, 0.f, depth);
 
                 glMatrixMode(GL_MODELVIEW);
                 glPushMatrix();
@@ -5225,8 +5250,8 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
                 }
                 else
                 {
-                        LLVector3 view_vector = gCamera->getOrigin() - objectp->getRenderPosition();
-                        silhouette_thickness = view_vector.magVec() * LLSelectMgr::sHighlightThickness * (gCamera->getView() / gCamera->getDefaultFOV());
+                        LLVector3 view_vector = LLViewerCamera::getInstance()->getOrigin() - objectp->getRenderPosition();
+                        silhouette_thickness = view_vector.magVec() * LLSelectMgr::sHighlightThickness * (LLViewerCamera::getInstance()->getView() / LLViewerCamera::getInstance()->getDefaultFOV());
                 }               
                 F32 animationTime = (F32)LLFrameTimer::getElapsedSeconds();
 
@@ -5240,10 +5265,10 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
                         gGL.blendFunc(GL_SRC_COLOR, GL_ONE);
                         LLGLEnable fog(GL_FOG);
                         glFogi(GL_FOG_MODE, GL_LINEAR);
-                        float d = (gCamera->getPointOfInterest()-gCamera->getOrigin()).magVec();
-                        LLColor4 fogCol = color * (F32)llclamp((gSelectMgr->getSelectionCenterGlobal()-gAgent.getCameraPositionGlobal()).magVec()/(gSelectMgr->getBBoxOfSelection().getExtentLocal().magVec()*4), 0.0, 1.0);
+                        float d = (LLViewerCamera::getInstance()->getPointOfInterest()-LLViewerCamera::getInstance()->getOrigin()).magVec();
+                        LLColor4 fogCol = color * (F32)llclamp((LLSelectMgr::getInstance()->getSelectionCenterGlobal()-gAgent.getCameraPositionGlobal()).magVec()/(LLSelectMgr::getInstance()->getBBoxOfSelection().getExtentLocal().magVec()*4), 0.0, 1.0);
                         glFogf(GL_FOG_START, d);
-                        glFogf(GL_FOG_END, d*(1 + (gCamera->getView() / gCamera->getDefaultFOV())));
+                        glFogf(GL_FOG_END, d*(1 + (LLViewerCamera::getInstance()->getView() / LLViewerCamera::getInstance()->getDefaultFOV())));
                         glFogfv(GL_FOG_COLOR, fogCol.mV);
 
                         LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE, GL_GEQUAL);
@@ -5371,7 +5396,7 @@ S32 get_family_count(LLViewerObject *parent)
                 }
                 else
                 {
-                        if (gSelectMgr->canSelectObject(child))
+                        if (LLSelectMgr::getInstance()->canSelectObject(child))
                         {
                                 count += get_family_count( child );
                         }
@@ -5463,9 +5488,9 @@ void LLSelectMgr::updateSelectionCenter()
 
         }
         
-        if ( !(gAgentID == LLUUID::null) && gToolMgr) 
+        if ( !(gAgentID == LLUUID::null)) 
         {
-                LLTool          *tool = gToolMgr->getCurrentTool();
+                LLTool          *tool = LLToolMgr::getInstance()->getCurrentTool();
                 if (mShowSelection)
                 {
                         LLVector3d select_center_global;
@@ -5654,9 +5679,9 @@ void LLSelectMgr::validateSelection()
         {
                 virtual bool apply(LLViewerObject* object)
                 {
-                        if (!gSelectMgr->canSelectObject(object))
+                        if (!LLSelectMgr::getInstance()->canSelectObject(object))
                         {
-                                gSelectMgr->deselectObjectOnly(object);
+                                LLSelectMgr::getInstance()->deselectObjectOnly(object);
                         }
                         return true;
                 }
@@ -6216,4 +6241,199 @@ LLViewerObject* LLObjectSelection::getFirstMoveableObject(BOOL get_parent)
         return getFirstSelectedObject(&func, get_parent);
 }
 
+//-----------------------------------------------------------------------------
+// Position + Rotation update methods called from LLViewerJoystick
+//-----------------------------------------------------------------------------
+bool LLSelectMgr::selectionMove(const LLVector3& displ,
+                                  F32 roll, F32 pitch, F32 yaw, U32 update_type)
+{
+        if (update_type == UPD_NONE)
+        {
+                return false;
+        }
+        
+        LLVector3 displ_global;
+        bool update_success = true;
+        bool update_position = update_type & UPD_POSITION;
+        bool update_rotation = update_type & UPD_ROTATION;
+        const bool noedit_linked_parts = !gSavedSettings.getBOOL("EditLinkedParts");
+        
+        if (update_position)
+        {
+                // calculate the distance of the object closest to the camera origin
+                F32 min_dist = 1e+30f;
+                LLVector3 obj_pos;
+                for (LLObjectSelection::root_iterator it = getSelection()->root_begin();
+                         it != getSelection()->root_end(); ++it)
+                {
+                        obj_pos = (*it)->getObject()->getPositionEdit();
+                        
+                        F32 obj_dist = dist_vec(obj_pos, LLViewerCamera::getInstance()->getOrigin());
+                        if (obj_dist < min_dist)
+                        {
+                                min_dist = obj_dist;
+                        }
+                }
+                
+                // factor the distance inside the displacement vector. This will get us
+                // equally visible movements for both close and far away selections.
+                min_dist = sqrt(min_dist) / 2;
+                displ_global.setVec(displ.mV[0]*min_dist, 
+                                                        displ.mV[1]*min_dist, 
+                                                        displ.mV[2]*min_dist);
+
+                // equates to: Displ_global = Displ * M_cam_axes_in_global_frame
+                displ_global = LLViewerCamera::getInstance()->rotateToAbsolute(displ_global);
+        }
+
+        LLQuaternion new_rot;
+        if (update_rotation)
+        {
+                // let's calculate the rotation around each camera axes 
+                LLQuaternion qx(roll, LLViewerCamera::getInstance()->getAtAxis());
+                LLQuaternion qy(pitch, LLViewerCamera::getInstance()->getLeftAxis());
+                LLQuaternion qz(yaw, LLViewerCamera::getInstance()->getUpAxis());
+                new_rot.setQuat(qx * qy * qz);
+        }
+        
+        LLViewerObject *obj;
+        S32 obj_count = getSelection()->getObjectCount();
+        for (LLObjectSelection::root_iterator it = getSelection()->root_begin();
+                 it != getSelection()->root_end(); ++it )
+        {
+                obj = (*it)->getObject();
+                bool enable_pos = false, enable_rot = false;
+                bool perm_move = obj->permMove();
+                bool perm_mod = obj->permModify();
+                
+                LLVector3d sel_center(getSelectionCenterGlobal());
+                
+                if (update_rotation)
+                {
+                        enable_rot = perm_move 
+                                && ((perm_mod && !obj->isAttachment()) || noedit_linked_parts);
+
+                        if (enable_rot)
+                        {
+                                int children_count = obj->getChildren().size();
+                                if (obj_count > 1 && children_count > 0)
+                                {
+                                        // for linked sets, rotate around the group center
+                                        const LLVector3 t(obj->getPositionGlobal() - sel_center);
+
+                                        // Ra = T x R x T^-1
+                                        LLMatrix4 mt;   mt.setTranslation(t);
+                                        const LLMatrix4 mnew_rot(new_rot);
+                                        LLMatrix4 mt_1; mt_1.setTranslation(-t);
+                                        mt *= mnew_rot;
+                                        mt *= mt_1;
+                                        
+                                        // Rfin = Rcur * Ra
+                                        obj->setRotation(obj->getRotationEdit() * mt.quaternion());
+                                        displ_global += mt.getTranslation();
+                                }
+                                else
+                                {
+                                        obj->setRotation(obj->getRotationEdit() * new_rot);
+                                }
+                        }
+                        else
+                        {
+                                update_success = false;
+                        }
+                }
+
+                if (update_position)
+                {
+                        // establish if object can be moved or not
+                        enable_pos = perm_move && !obj->isAttachment() 
+                        && (perm_mod || noedit_linked_parts);
+                        
+                        if (enable_pos)
+                        {
+                                obj->setPosition(obj->getPositionEdit() + displ_global);
+                        }
+                        else
+                        {
+                                update_success = false;
+                        }
+                }
+                
+                if (enable_pos && enable_rot && obj->mDrawable.notNull())
+                {
+                        gPipeline.markMoved(obj->mDrawable, TRUE);
+                }
+        }
+        
+        if (update_position && update_success && obj_count > 1)
+        {
+                updateSelectionCenter();
+        }
+        
+        return update_success;
+}
+
+void LLSelectMgr::sendSelectionMove()
+{
+        LLSelectNode *node = mSelectedObjects->getFirstRootNode();
+        if (node == NULL)
+        {
+                return;
+        }
+        
+        //saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
+        
+        U32 update_type = UPD_POSITION | UPD_ROTATION;
+        LLViewerRegion *last_region, *curr_region = node->getObject()->getRegion();
+        S32 objects_in_this_packet = 0;
+
+        // apply to linked objects if unable to select their individual parts 
+        if (!gSavedSettings.getBOOL("EditLinkedParts") && !getTEMode())
+        {
+                // tell simulator to apply to whole linked sets
+                update_type |= UPD_LINKED_SETS;
+        }
+
+        // prepare first bulk message
+        gMessageSystem->newMessage("MultipleObjectUpdate");
+        packAgentAndSessionID(&update_type);
+
+        LLViewerObject *obj = NULL;
+        for (LLObjectSelection::root_iterator it = getSelection()->root_begin();
+                 it != getSelection()->root_end(); ++it)
+        {
+                obj = (*it)->getObject();
 
+                // note: following code adapted from sendListToRegions() (@3924)
+                last_region = curr_region;
+                curr_region = obj->getRegion();
+
+                // if not simulator or message too big
+                if (curr_region != last_region
+                        || gMessageSystem->isSendFull(NULL)
+                        || objects_in_this_packet >= MAX_OBJECTS_PER_PACKET)
+                {
+                        // send sim the current message and start new one
+                        gMessageSystem->sendReliable(last_region->getHost());
+                        objects_in_this_packet = 0;
+                        gMessageSystem->newMessage("MultipleObjectUpdate");
+                        packAgentAndSessionID(&update_type);
+                }
+
+                // add another instance of the body of data
+                packMultipleUpdate(*it, &update_type);
+                ++objects_in_this_packet;
+        }
+
+        // flush remaining messages
+        if (gMessageSystem->getCurrentSendTotal() > 0)
+        {
+                gMessageSystem->sendReliable(curr_region->getHost());
+        }
+        else
+        {
+                gMessageSystem->clearMessage();
+        }
+
+        //saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
+}