1 files changed, 90 insertions, 31 deletions

diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index 9d8369f..47289ff 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -90,7 +90,7 @@ LLVOVolume::LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *re
         mLOD = MIN_LOD;
         mSculptLevel = -2;
         mTextureAnimp = NULL;
-        mVObjRadius = LLVector3(1,1,0.5f).magVec();
+        mVObjRadius = LLVector3(1,1,0.5f).length();
         mNumFaces = 0;
         mLODChanged = FALSE;
         mSculptChanged = FALSE;
@@ -577,7 +577,7 @@ F32 LLVOVolume::getTextureVirtualSize(LLFace* face)
 
         //get area of circle in texture space
         LLVector2 tdim = face->mTexExtents[1] - face->mTexExtents[0];
-        F32 texel_area = (tdim * 0.5f).magVecSquared()*3.14159f;
+        F32 texel_area = (tdim * 0.5f).lengthSquared()*3.14159f;
         if (texel_area <= 0)
         {
                 // Probably animated, use default
@@ -605,7 +605,7 @@ BOOL LLVOVolume::setMaterial(const U8 material)
 void LLVOVolume::setTexture(const S32 face)
 {
         llassert(face < getNumTEs());
-        LLViewerImage::bindTexture(getTEImage(face));
+        gGL.getTexUnit(0)->bind(getTEImage(face));
 }
 
 void LLVOVolume::setScale(const LLVector3 &scale, BOOL damped)
@@ -828,7 +828,7 @@ BOOL LLVOVolume::calcLOD()
 
         S32 cur_detail = 0;
         
-        F32 radius = getVolume()->mLODScaleBias.scaledVec(getScale()).magVec();
+        F32 radius = getVolume()->mLODScaleBias.scaledVec(getScale()).length();
         F32 distance = mDrawable->mDistanceWRTCamera;
         distance *= sDistanceFactor;
                         
@@ -1687,7 +1687,7 @@ void LLVOVolume::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_p
 
                 //transform view vector into volume space
                 view_vector -= getRenderPosition();
-                mDrawable->mDistanceWRTCamera = view_vector.magVec();
+                mDrawable->mDistanceWRTCamera = view_vector.length();
                 LLQuaternion worldRot = getRenderRotation();
                 view_vector = view_vector * ~worldRot;
                 if (!isVolumeGlobal())
@@ -1728,7 +1728,7 @@ void LLVOVolume::updateRadius()
                 return;
         }
         
-        mVObjRadius = getScale().magVec();
+        mVObjRadius = getScale().length();
         mDrawable->setRadius(mVObjRadius);
 }
 
@@ -1841,7 +1841,7 @@ F32 LLVOVolume::getBinRadius()
         }
         else if (shrink_wrap)
         {
-                radius = (ext[1]-ext[0]).magVec()*0.5f;
+                radius = (ext[1]-ext[0]).length()*0.5f;
         }
         else if (mDrawable->isStatic())
         {
@@ -1934,10 +1934,18 @@ LLVector3 LLVOVolume::volumeDirectionToAgent(const LLVector3& dir) const
 }
 
 
-BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& end, S32 face, S32 *face_hitp,
+BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& end, S32 face, BOOL pick_transparent, S32 *face_hitp,
                                                                           LLVector3* intersection,LLVector2* tex_coord, LLVector3* normal, LLVector3* bi_normal)
         
 {
+        if (!mbCanSelect ||
+                (gHideSelectedObjects && isSelected()) ||
+                        mDrawable->isDead() || 
+                        !gPipeline.hasRenderType(mDrawable->getRenderType()))
+        {
+                return FALSE;
+        }
+
         LLVolume* volume = getVolume();
         if (volume)
         {       
@@ -1946,37 +1954,88 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e
                 v_start = agentPositionToVolume(start);
                 v_end = agentPositionToVolume(end);
                 
-                S32 face_hit = volume->lineSegmentIntersect(v_start, v_end, face,
-                                                                                                        intersection, tex_coord, normal, bi_normal);
-                if (face_hit >= 0)
+                LLVector3 p;
+                LLVector3 n;
+                LLVector2 tc;
+                LLVector3 bn;
+
+                if (intersection != NULL)
                 {
-                        if (face_hitp != NULL)
-                        {
-                                *face_hitp = face_hit;
-                        }
+                        p = *intersection;
+                }
+
+                if (tex_coord != NULL)
+                {
+                        tc = *tex_coord;
+                }
+
+                if (normal != NULL)
+                {
+                        n = *normal;
+                }
+
+                if (bi_normal != NULL)
+                {
+                        bn = *bi_normal;
+                }
+
+                S32 face_hit = -1;
+
+                S32 start_face, end_face;
+                if (face == -1)
+                {
+                        start_face = 0;
+                        end_face = volume->getNumFaces();
+                }
+                else
+                {
+                        start_face = face;
+                        end_face = face+1;
+                }
+
+                for (S32 i = start_face; i < end_face; ++i)
+                {
+                        face_hit = volume->lineSegmentIntersect(v_start, v_end, i,
+                                                                                                        &p, &tc, &n, &bn);
                         
-                        if (intersection != NULL)
+                        if (face_hit >= 0)
                         {
-                                *intersection = volumePositionToAgent(*intersection);  // must map back to agent space
-                        }
+                                LLFace* face = mDrawable->getFace(face_hit);
+                                if (pick_transparent || !face->getTexture() || face->getTexture()->getMask(face->surfaceToTexture(tc, p, n)))
+                                {
+                                        if (face_hitp != NULL)
+                                        {
+                                                *face_hitp = face_hit;
+                                        }
+                                        
+                                        if (intersection != NULL)
+                                        {
+                                                *intersection = volumePositionToAgent(p);  // must map back to agent space
+                                        }
 
-                        if (normal != NULL)
-                        {
-                                *normal = volumeDirectionToAgent(*normal);
-                                (*normal).normVec();
-                        }
+                                        if (normal != NULL)
+                                        {
+                                                *normal = volumeDirectionToAgent(n);
+                                                (*normal).normVec();
+                                        }
 
-                        if (bi_normal != NULL)
-                        {
-                                *bi_normal = volumeDirectionToAgent(*bi_normal);
-                                (*bi_normal).normVec();
-                        }
+                                        if (bi_normal != NULL)
+                                        {
+                                                *bi_normal = volumeDirectionToAgent(bn);
+                                                (*bi_normal).normVec();
+                                        }
 
-                        
-                        return TRUE;
+                                        if (tex_coord != NULL)
+                                        {
+                                                *tex_coord = tc;
+                                        }
+                                        
+                                        return TRUE;
+                                }
+                        }
                 }
         }
-        
+                
         return FALSE;
 }