1 files changed, 66 insertions, 19 deletions

diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index e352f14..b70dd23 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -68,6 +68,7 @@
 const S32 MIN_QUIET_FRAMES_COALESCE = 30;
 const F32 FORCE_SIMPLE_RENDER_AREA = 512.f;
 const F32 FORCE_CULL_AREA = 8.f;
+// sadly - we can't lower sculptie rez below b/c residents have a LOT of content that depends on the 128
 const S32 SCULPT_REZ = 128;
 
 BOOL gAnimateTextures = TRUE;
@@ -87,6 +88,7 @@ LLVOVolume::LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *re
         mRelativeXformInvTrans.setIdentity();
 
         mLOD = MIN_LOD;
+        mSculptLevel = -2;
         mTextureAnimp = NULL;
         mVObjRadius = LLVector3(1,1,0.5f).magVec();
         mNumFaces = 0;
@@ -212,9 +214,9 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
                                 // Well, crap, there's something bogus in the data that we're unpacking.
                                 dp->dumpBufferToLog();
                                 llwarns << "Flushing cache files" << llendl;
-                                char mask[LL_MAX_PATH];         /* Flawfinder: ignore */
-                                snprintf(mask, LL_MAX_PATH, "%s*.slc", gDirUtilp->getDirDelimiter().c_str());           /* Flawfinder: ignore */
-                                gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"").c_str(),mask);
+                                std::string mask;
+                                mask = gDirUtilp->getDirDelimiter() + "*.slc";
+                                gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE,""), mask);
 //                              llerrs << "Bogus TE data in " << getID() << ", crashing!" << llendl;
                                 llwarns << "Bogus TE data in " << getID() << llendl;
                         }
@@ -515,12 +517,13 @@ void LLVOVolume::updateTextures()
                 if (mSculptTexture.notNull())
                 {
                         mSculptTexture->addTextureStats(SCULPT_REZ * SCULPT_REZ);
-                        mSculptTexture->setBoostLevel(LLViewerImage::BOOST_SCULPTED);
+                        mSculptTexture->setBoostLevel(llmax((S32)mSculptTexture->getBoostLevel(),
+                                                                                                (S32)LLViewerImage::BOOST_SCULPTED));
                 }
 
                 S32 texture_discard = mSculptTexture->getDiscardLevel(); //try to match the texture
-                S32 current_discard = getVolume()->getSculptLevel();
-                
+                S32 current_discard = mSculptLevel;
+
                 if (texture_discard >= 0 && //texture has some data available
                         (texture_discard < current_discard || //texture has more data than last rebuild
                         current_discard < 0)) //no previous rebuild
@@ -528,7 +531,13 @@ void LLVOVolume::updateTextures()
                         gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, FALSE);
                         mSculptChanged = TRUE;
                 }
-                
+
+                if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_SCULPTED))
+                        {
+                                setDebugText(llformat("T%d C%d V%d\n%dx%d",
+                                                                          texture_discard, current_discard, getVolume()->getSculptLevel(),
+                                                                          mSculptTexture->getHeight(), mSculptTexture->getWidth()));
+                        }
         }
 
 
@@ -701,6 +710,7 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams &volume_params, const S32 detail
                         if (mSculptTexture.notNull())
                         {
                                 sculpt();
+                                mSculptLevel = getVolume()->getSculptLevel();
                         }
                 }
                 else
@@ -1893,26 +1903,42 @@ LLVector3 LLVOVolume::agentPositionToVolume(const LLVector3& pos) const
 
 LLVector3 LLVOVolume::agentDirectionToVolume(const LLVector3& dir) const
 {
-        return dir * ~getRenderRotation();
+        LLVector3 ret = dir * ~getRenderRotation();
+        
+        LLVector3 objScale = isVolumeGlobal() ? LLVector3(1,1,1) : getScale();
+        ret.scaleVec(objScale);
+
+        return ret;
 }
 
 LLVector3 LLVOVolume::volumePositionToAgent(const LLVector3& dir) const
 {
         LLVector3 ret = dir;
-        ret.scaleVec(getScale());
+        LLVector3 objScale = isVolumeGlobal() ? LLVector3(1,1,1) : getScale();
+        ret.scaleVec(objScale);
         ret = ret * getRenderRotation();
         ret += getRenderPosition();
         
         return ret;
 }
 
-BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, LLVector3& end) const
+LLVector3 LLVOVolume::volumeDirectionToAgent(const LLVector3& dir) const
 {
-        return FALSE;
+        LLVector3 ret = dir;
+        LLVector3 objScale = isVolumeGlobal() ? LLVector3(1,1,1) : getScale();
+        LLVector3 invObjScale(1.f / objScale.mV[VX], 1.f / objScale.mV[VY], 1.f / objScale.mV[VZ]);
+        ret.scaleVec(invObjScale);
+        ret = ret * getRenderRotation();
+
+        return ret;
+}
+
+
+BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& end, S32 face, S32 *face_hitp,
+                                                                          LLVector3* intersection,LLVector2* tex_coord, LLVector3* normal, LLVector3* bi_normal)
         
-#if 0 // needs to be rewritten to use face extents instead of volume bounds
+{
         LLVolume* volume = getVolume();
-        BOOL ret = FALSE;
         if (volume)
         {       
                 LLVector3 v_start, v_end, v_dir;
@@ -1920,17 +1946,38 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, LLVector3& end) co
                 v_start = agentPositionToVolume(start);
                 v_end = agentPositionToVolume(end);
                 
-                if (LLLineSegmentAABB(v_start, v_end, volume->mBounds[0], volume->mBounds[1]))
+                S32 face_hit = volume->lineSegmentIntersect(v_start, v_end, face,
+                                                                                                        intersection, tex_coord, normal, bi_normal);
+                if (face_hit >= 0)
                 {
-                        if (volume->lineSegmentIntersect(v_start, v_end) >= 0)
+                        if (face_hitp != NULL)
+                        {
+                                *face_hitp = face_hit;
+                        }
+                        
+                        if (intersection != NULL)
+                        {
+                                *intersection = volumePositionToAgent(*intersection);  // must map back to agent space
+                        }
+
+                        if (normal != NULL)
                         {
-                                end = volumePositionToAgent(v_end);
-                                ret = TRUE;
+                                *normal = volumeDirectionToAgent(*normal);
+                                (*normal).normVec();
                         }
+
+                        if (bi_normal != NULL)
+                        {
+                                *bi_normal = volumeDirectionToAgent(*bi_normal);
+                                (*bi_normal).normVec();
+                        }
+
+                        
+                        return TRUE;
                 }
         }
-        return ret;
-#endif
+        
+        return FALSE;
 }
 
 U32 LLVOVolume::getPartitionType() const