Second Life viewer sources 1.21.0-RC

1 files changed, 12 insertions, 1 deletions

diff --git a/linden/indra/newview/llvovolume.h b/linden/indra/newview/llvovolume.h
index 6177340..d8828f0 100644
--- a/linden/indra/newview/llvovolume.h
+++ b/linden/indra/newview/llvovolume.h
@@ -111,10 +111,20 @@ public:
         const LLMatrix3&        getRelativeXformInvTrans() const                { return mRelativeXformInvTrans; }
         /*virtual*/     const LLMatrix4 getRenderMatrix() const;
 
-        /*virtual*/ BOOL        lineSegmentIntersect(const LLVector3& start, LLVector3& end) const;
+
+        /*virtual*/ BOOL lineSegmentIntersect(const LLVector3& start, const LLVector3& end, 
+                                                                                  S32 face = -1,                        // which face to check, -1 = ALL_SIDES
+                                                                                  S32* face_hit = NULL,                 // which face was hit
+                                                                                  LLVector3* intersection = NULL,       // return the intersection point
+                                                                                  LLVector2* tex_coord = NULL,          // return the texture coordinates of the intersection point
+                                                                                  LLVector3* normal = NULL,             // return the surface normal at the intersection point
+                                                                                  LLVector3* bi_normal = NULL           // return the surface bi-normal at the intersection point
+                );
+        
                                 LLVector3 agentPositionToVolume(const LLVector3& pos) const;
                                 LLVector3 agentDirectionToVolume(const LLVector3& dir) const;
                                 LLVector3 volumePositionToAgent(const LLVector3& dir) const;
+                                LLVector3 volumeDirectionToAgent(const LLVector3& dir) const;
 
                                 
                                 BOOL    getVolumeChanged() const                                { return mVolumeChanged; }
@@ -214,6 +224,7 @@ private:
         LLFrameTimer mTextureUpdateTimer;
         S32                     mLOD;
         BOOL            mLODChanged;
+        S32         mSculptLevel;
         BOOL            mSculptChanged;
         LLMatrix4       mRelativeXform;
         LLMatrix3       mRelativeXformInvTrans;