Updated llselectmgr.cpp to snowglobe 1.4

2 files changed, 88 insertions, 88 deletions

diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index e4f914f..01f41ef 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -770,7 +770,7 @@ void LLSelectMgr::addAsIndividual(LLViewerObject *objectp, S32 face, BOOL undoab
 }
 
 
-LLObjectSelectionHandle LLSelectMgr::setHoverObject(LLViewerObject *objectp)
+LLObjectSelectionHandle LLSelectMgr::setHoverObject(LLViewerObject *objectp, S32 face)
 {
         // Always blitz hover list when setting
         mHoverObjects->deleteAllNodes();
@@ -802,6 +802,7 @@ LLObjectSelectionHandle LLSelectMgr::setHoverObject(LLViewerObject *objectp)
         {
                 LLViewerObject* cur_objectp = *iter;
                 LLSelectNode* nodep = new LLSelectNode(cur_objectp, FALSE);
+                nodep->selectTE(face, TRUE);
                 mHoverObjects->addNodeAtEnd(nodep);
         }
 
@@ -3437,20 +3438,12 @@ void LLSelectMgr::deselectAllIfTooFar()
         }
 
         LLVector3d selectionCenter = getSelectionCenterGlobal();
-
-//      if (gSavedSettings.getBOOL("LimitSelectDistance")
-// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f
-        BOOL fRlvFartouch = gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH) && gFloaterTools->getVisible();
-        if ( (gSavedSettings.getBOOL("LimitSelectDistance") || (fRlvFartouch) )
-// [/RLVa:KB]
+        if (gSavedSettings.getBOOL("LimitSelectDistance")
                 && (!mSelectedObjects->getPrimaryObject() || !mSelectedObjects->getPrimaryObject()->isAvatar())
                 && !mSelectedObjects->isAttachment()
                 && !selectionCenter.isExactlyZero())
         {
-//              F32 deselect_dist = gSavedSettings.getF32("MaxSelectDistance");
-// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f
-                F32 deselect_dist = (!fRlvFartouch) ? gSavedSettings.getF32("MaxSelectDistance") : 1.5f;
-// [/RLVa:KB]
+                F32 deselect_dist = gSavedSettings.getF32("MaxSelectDistance");
                 F32 deselect_dist_sq = deselect_dist * deselect_dist;
 
                 LLVector3d select_delta = gAgent.getPositionGlobal() - selectionCenter;
@@ -4580,54 +4573,7 @@ void LLSelectMgr::updateSilhouettes()
         
         std::vector<LLViewerObject*> changed_objects;
 
-        if (mSelectedObjects->getNumNodes())
-        {
-                //gGLSPipelineSelection.set();
-
-                //mSilhouetteImagep->bindTexture();
-                //glAlphaFunc(GL_GREATER, sHighlightAlphaTest);
-
-                for (S32 pass = 0; pass < 2; pass++)
-                {
-                        for (LLObjectSelection::iterator iter = mSelectedObjects->begin();
-                                 iter != mSelectedObjects->end(); iter++)
-                        {
-                                LLSelectNode* node = *iter;
-                                LLViewerObject* objectp = node->getObject();
-                                if (!objectp)
-                                        continue;
-                                // do roots first, then children so that root flags are cleared ASAP
-                                BOOL roots_only = (pass == 0);
-                                BOOL is_root = (objectp->isRootEdit());
-                                if (roots_only != is_root || objectp->mDrawable.isNull())
-                                {
-                                        continue;
-                                }
-
-                                if (!node->mSilhouetteExists 
-                                        || objectp->isChanged(LLXform::SILHOUETTE)
-                                        || (objectp->getParent() && objectp->getParent()->isChanged(LLXform::SILHOUETTE)))
-                                {
-                                        if (num_sils_genned++ < MAX_SILS_PER_FRAME)// && objectp->mDrawable->isVisible())
-                                        {
-                                                generateSilhouette(node, LLViewerCamera::getInstance()->getOrigin());
-                                                changed_objects.push_back(objectp);
-                                        }
-                                        else if (objectp->isAttachment())
-                                        {
-                                                //RN: hack for orthogonal projection of HUD attachments
-                                                LLViewerJointAttachment* attachment_pt = (LLViewerJointAttachment*)objectp->getRootEdit()->mDrawable->getParent();
-                                                if (attachment_pt && attachment_pt->getIsHUDAttachment())
-                                                {
-                                                        LLVector3 camera_pos = LLVector3(-10000.f, 0.f, 0.f);
-                                                        generateSilhouette(node, camera_pos);
-                                                }
-                                        }
-                                }
-                        }
-                }
-        }
-
+        updateSelectionSilhouette(mSelectedObjects, num_sils_genned, changed_objects);
         if (mRectSelectedObjects.size() > 0)
         {
                 //gGLSPipelineSelection.set();
@@ -4821,6 +4767,56 @@ void LLSelectMgr::updateSilhouettes()
         //gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
 }
 
+void LLSelectMgr::updateSelectionSilhouette(LLObjectSelectionHandle object_handle, S32& num_sils_genned, std::vector<LLViewerObject*>& changed_objects)
+{
+        if (object_handle->getNumNodes())
+        {
+                //gGLSPipelineSelection.set();
+
+                //mSilhouetteImagep->bindTexture();
+                //glAlphaFunc(GL_GREATER, sHighlightAlphaTest);
+
+                for (S32 pass = 0; pass < 2; pass++)
+                {
+                        for (LLObjectSelection::iterator iter = object_handle->begin();
+                                iter != object_handle->end(); iter++)
+                        {
+                                LLSelectNode* node = *iter;
+                                LLViewerObject* objectp = node->getObject();
+                                if (!objectp)
+                                        continue;
+                                // do roots first, then children so that root flags are cleared ASAP
+                                BOOL roots_only = (pass == 0);
+                                BOOL is_root = (objectp->isRootEdit());
+                                if (roots_only != is_root || objectp->mDrawable.isNull())
+                                {
+                                        continue;
+                                }
+
+                                if (!node->mSilhouetteExists 
+                                        || objectp->isChanged(LLXform::SILHOUETTE)
+                                        || (objectp->getParent() && objectp->getParent()->isChanged(LLXform::SILHOUETTE)))
+                                {
+                                        if (num_sils_genned++ < MAX_SILS_PER_FRAME)// && objectp->mDrawable->isVisible())
+                                        {
+                                                generateSilhouette(node, LLViewerCamera::getInstance()->getOrigin());
+                                                changed_objects.push_back(objectp);
+                                        }
+                                        else if (objectp->isAttachment())
+                                        {
+                                                //RN: hack for orthogonal projection of HUD attachments
+                                                LLViewerJointAttachment* attachment_pt = (LLViewerJointAttachment*)objectp->getRootEdit()->mDrawable->getParent();
+                                                if (attachment_pt && attachment_pt->getIsHUDAttachment())
+                                                {
+                                                        LLVector3 camera_pos = LLVector3(-10000.f, 0.f, 0.f);
+                                                        generateSilhouette(node, camera_pos);
+                                                }
+                                        }
+                                }
+                        }
+                }
+        }
+}
 void LLSelectMgr::renderSilhouettes(BOOL for_hud)
 {
         if (!mRenderSilhouettes || !LLSelectMgr::sRenderSelectionHighlights)
@@ -4954,32 +4950,29 @@ void LLSelectMgr::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_
 // Utility classes
 //
 LLSelectNode::LLSelectNode(LLViewerObject* object, BOOL glow)
+:       mObject(object),
+        mIndividualSelection(FALSE),
+        mTransient(FALSE),
+        mValid(FALSE),
+        mPermissions(new LLPermissions()),
+        mInventorySerial(0),
+        mSilhouetteExists(FALSE),
+        mDuplicated(FALSE),
+        mTESelectMask(0),
+        mLastTESelected(0),
+        mName(LLStringUtil::null),
+        mDescription(LLStringUtil::null),
+        mTouchName(LLStringUtil::null),
+        mSitName(LLStringUtil::null),
+        mCreationDate(0)
 {
-        mObject = object;
         selectAllTEs(FALSE);
-        mIndividualSelection    = FALSE;
-        mTransient              = FALSE;
-        mValid                  = FALSE;
-        mPermissions    = new LLPermissions();
-        mInventorySerial = 0;
-        mName = LLStringUtil::null;
-        mDescription = LLStringUtil::null;
-        mTouchName = LLStringUtil::null;
-        mSitName = LLStringUtil::null;
-        mSilhouetteExists = FALSE;
-        mDuplicated = FALSE;
-        mCreationDate = 0;
-
         saveColors();
 }
 
 LLSelectNode::LLSelectNode(const LLSelectNode& nodep)
 {
-        S32 i;
-        for (i = 0; i < SELECT_MAX_TES; i++)
-        {
-                mTESelected[i] = nodep.mTESelected[i];
-        }
+        mTESelectMask = nodep.mTESelectMask;
         mLastTESelected = nodep.mLastTESelected;
 
         mIndividualSelection = nodep.mIndividualSelection;
@@ -5032,10 +5025,7 @@ LLSelectNode::~LLSelectNode()
 
 void LLSelectNode::selectAllTEs(BOOL b)
 {
-        for (S32 i = 0; i < SELECT_MAX_TES; i++)
-        {
-                mTESelected[i] = b;
-        }
+        mTESelectMask = b ? 0xFFFFFFFF : 0x0;
         mLastTESelected = 0;
 }
 
@@ -5045,7 +5035,14 @@ void LLSelectNode::selectTE(S32 te_index, BOOL selected)
         {
                 return;
         }
-        mTESelected[te_index] = selected;
+        if (selected)
+        {
+                mTESelectMask |= (0x1 << te_index);
+        }
+        else
+        {
+                mTESelectMask &= ~(0x1 << te_index);
+        }
         mLastTESelected = te_index;
 }
 
@@ -5055,7 +5052,7 @@ BOOL LLSelectNode::isTESelected(S32 te_index)
         {
                 return FALSE;
         }
-        return mTESelected[te_index];
+        return (mTESelectMask & (0x1 << te_index)) != 0;
 }
 
 S32 LLSelectNode::getLastSelectedTE()
@@ -5504,11 +5501,11 @@ void LLSelectMgr::updateSelectionCenter()
                 LLVector3d select_center;
                 // keep a list of jointed objects for showing the joint HUDEffects
 
-                std::vector < LLViewerObject *> jointed_objects;
-
                 // Initialize the bounding box to the root prim, so the BBox orientation
                 // matches the root prim's (affecting the orientation of the manipulators).
                 bbox.addBBoxAgent( (mSelectedObjects->getFirstRootObject(TRUE))->getBoundingBoxAgent() );
+                
+                std::vector < LLViewerObject *> jointed_objects;
 
                 for (LLObjectSelection::iterator iter = mSelectedObjects->begin();
                          iter != mSelectedObjects->end(); iter++)
diff --git a/linden/indra/newview/llselectmgr.h b/linden/indra/newview/llselectmgr.h
index 1e49afe..8165394 100644
--- a/linden/indra/newview/llselectmgr.h
+++ b/linden/indra/newview/llselectmgr.h
@@ -138,6 +138,7 @@ public:
         void selectTE(S32 te_index, BOOL selected);
         BOOL isTESelected(S32 te_index);
         S32 getLastSelectedTE();
+        S32 getTESelectMask() { return mTESelectMask; }
         void renderOneSilhouette(const LLColor4 &color);
         void setTransient(BOOL transient) { mTransient = transient; }
         BOOL isTransient() { return mTransient; }
@@ -190,7 +191,7 @@ public:
 
 protected:
         LLPointer<LLViewerObject>       mObject;
-        BOOL                    mTESelected[SELECT_MAX_TES];
+        S32                             mTESelectMask;
         S32                             mLastTESelected;
 };
 
@@ -406,7 +407,7 @@ public:
         // converts all objects currently highlighted to a selection, and returns it
         LLObjectSelectionHandle selectHighlightedObjects();
 
-        LLObjectSelectionHandle setHoverObject(LLViewerObject *objectp);
+        LLObjectSelectionHandle setHoverObject(LLViewerObject *objectp, S32 face = -1);
 
         void highlightObjectOnly(LLViewerObject *objectp);
         void highlightObjectAndFamily(LLViewerObject *objectp);
@@ -647,6 +648,7 @@ private:
         ESelectType getSelectTypeForObject(LLViewerObject* object);
         void addAsFamily(std::vector<LLViewerObject*>& objects, BOOL add_to_end = FALSE);
         void generateSilhouette(LLSelectNode *nodep, const LLVector3& view_point);
+        void updateSelectionSilhouette(LLObjectSelectionHandle object_handle, S32& num_sils_genned, std::vector<LLViewerObject*>& changed_objects);
         // Send one message to each region containing an object on selection list.
         void sendListToRegions( const std::string& message_name,
                                                         void (*pack_header)(void *user_data), 
@@ -654,6 +656,7 @@ private:
                                                         void *user_data,
                                                         ESendType send_type);
 
+
         static void packAgentID(        void *);
         static void packAgentAndSessionID(void* user_data);
         static void packAgentAndGroupID(void* user_data);