Second Life viewer sources 1.17.0.12

4 files changed, 59 insertions, 48 deletions

diff --git a/linden/indra/llmath/lloctree.h b/linden/indra/llmath/lloctree.h
index 81b9d8c..004b0a2 100644
--- a/linden/indra/llmath/lloctree.h
+++ b/linden/indra/llmath/lloctree.h
@@ -57,7 +57,6 @@ public:
         typedef LLTreeListener<T> BaseType;
         typedef LLOctreeNode<T> oct_node;
 
-        virtual ~LLOctreeListener() { };
         virtual void handleChildAddition(const oct_node* parent, oct_node* child) = 0;
         virtual void handleChildRemoval(const oct_node* parent, const oct_node* child) = 0;
 };
diff --git a/linden/indra/llmath/lltreenode.h b/linden/indra/llmath/lltreenode.h
index a42a156..a47795d 100644
--- a/linden/indra/llmath/lltreenode.h
+++ b/linden/indra/llmath/lltreenode.h
@@ -57,7 +57,6 @@ template <class T>
 class LLTreeListener: public LLRefCount
 {
 public:
-        virtual ~LLTreeListener() { };
         virtual void handleInsertion(const LLTreeNode<T>* node, T* data) = 0;
         virtual void handleRemoval(const LLTreeNode<T>* node, T* data) = 0;
         virtual void handleDestruction(const LLTreeNode<T>* node) = 0;
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index fb745b8..327f1bf 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/indra/llmath/llvolume.cpp
@@ -1829,13 +1829,16 @@ void LLVolume::sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components,
                                 U32 x = (U32) ((F32)s/(sizeS-1) * (F32) sculpt_width);
                                 U32 y = (U32) ((F32)t/(sizeT-1) * (F32) sculpt_height);
 
-                                if (y == sculpt_height)  // clamp to bottom row
+                                if (y == sculpt_height)  // stitch bottom
+                                {
                                         y = sculpt_height - 1;
+                                        x = sculpt_width / 2;
+                                }
 
                                 if (x == sculpt_width)   // stitch sides
                                         x = 0;
 
-                                if ((y == 0) || (y == sculpt_height-1))  // stitch top and bottom
+                                if (y == 0)  // stitch top
                                         x = sculpt_width / 2;
 
                                 U32 index = (x + y * sculpt_width) * sculpt_components;
@@ -1847,63 +1850,69 @@ void LLVolume::sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components,
 
                                 last_index = index;
                         }
+                if ((F32)vertex_change / sizeS / sizeT < 0.05) // less than 5%
+                        data_is_empty = TRUE;
         }
 
-        
-        if ((F32)vertex_change / sizeS / sizeT < 0.05) // less than 5%
-                data_is_empty = TRUE;
-        
-        
         //generate vertex positions
-        // Run along the path.
-        S32 s = 0, t = 0;
-        S32 line = 0;
-        while (s < sizeS)
+        if (data_is_empty) // if empty, make a sphere
         {
-                t = 0;
-                // Run along the profile.
-                while (t < sizeT)
-                {
-                        S32 i = t + line;
-                        Point& pt = mMesh[i];
-
-                        U32 x = (U32) ((F32)t/(sizeT-1) * (F32) sculpt_width);
-                        U32 y = (U32) ((F32)s/(sizeS-1) * (F32) sculpt_height);
+                S32 line = 0;
 
-                        if (y == sculpt_height)  // clamp to bottom row
-                                y = sculpt_height - 1;
-
-                        if (x == sculpt_width)   // stitch sides
-                                x = 0;
+                for (S32 s = 0; s < sizeS; s++)
+                {
+                        for (S32 t = 0; t < sizeT; t++)
+                        {
+                                S32 i = t + line;
+                                Point& pt = mMesh[i];
 
-                        if ((y == 0) || (y == sculpt_height-1))  // stitch top and bottom
-                                x = sculpt_width / 2;
                         
-
-                        if (data_is_empty) // if empty, make a sphere
-                        {
                                 F32 u = (F32)s/(sizeS-1);
                                 F32 v = (F32)t/(sizeT-1);
 
                                 const F32 RADIUS = (F32) 0.3;
-                                
+                                        
                                 pt.mPos.mV[0] = (F32)(sin(F_PI * v) * cos(2.0 * F_PI * u) * RADIUS);
                                 pt.mPos.mV[1] = (F32)(sin(F_PI * v) * sin(2.0 * F_PI * u) * RADIUS);
                                 pt.mPos.mV[2] = (F32)(cos(F_PI * v) * RADIUS);
+
                         }
-                        
-                        else
+                        line += sizeT;
+                }
+        }
+        else
+        {
+                S32 line = 0;
+                for (S32 s = 0; s < sizeS; s++)
+                {
+                        // Run along the profile.
+                        for (S32 t = 0; t < sizeT; t++)
                         {
+                                S32 i = t + line;
+                                Point& pt = mMesh[i];
+
+                                U32 x = (U32) ((F32)t/(sizeT-1) * (F32) sculpt_width);
+                                U32 y = (U32) ((F32)s/(sizeS-1) * (F32) sculpt_height);
+
+                                if (y == sculpt_height)  // stitch bottom row
+                                {
+                                        y = sculpt_height - 1;
+                                        x = sculpt_width / 2;
+                                }
+
+                                if (x == sculpt_width)   // stitch sides
+                                        x = 0;
+
+                                if (y == 0)  // stitch top row
+                                        x = sculpt_width / 2;
+                        
                                 U32 index = (x + y * sculpt_width) * sculpt_components;
                                 pt.mPos.mV[0] = sculpt_data[index  ] / 256.f - 0.5f;
                                 pt.mPos.mV[1] = sculpt_data[index+1] / 256.f - 0.5f;
                                 pt.mPos.mV[2] = sculpt_data[index+2] / 256.f - 0.5f;
                         }
-
-                        t++;
+                        line += sizeT;
                 }
-                line += sizeT;
-                s++;
         }
 
         for (S32 i = 0; i < (S32)mProfilep->mFaces.size(); i++)
diff --git a/linden/indra/llmath/llvolume.h b/linden/indra/llmath/llvolume.h
index a3e89ab..6ac07f5 100644
--- a/linden/indra/llmath/llvolume.h
+++ b/linden/indra/llmath/llvolume.h
@@ -635,12 +635,14 @@ protected:
 class LLProfile
 {
 public:
-        LLProfile(const LLProfileParams &params) : mParams(params)
+        LLProfile(const LLProfileParams &params)
+                : mParams(params),
+                  mOpen(FALSE),
+                  mConcave(FALSE),
+                  mDirty(TRUE),
+                  mTotalOut(0),
+                  mTotal(2)
         {
-                mTotal    = 2;
-                mTotalOut = 0;
-                mDirty    = TRUE;
-                mConcave = FALSE;
         }
 
         ~LLProfile();
@@ -710,11 +712,13 @@ public:
         };
 
 public:
-        LLPath(const LLPathParams &params) : mParams(params)
+        LLPath(const LLPathParams &params)
+                : mParams(params),
+                  mOpen(FALSE),
+                  mTotal(0),
+                  mDirty(TRUE),
+                  mStep(1)
         {
-                mOpen      = FALSE;
-                mDirty     = TRUE;
-                mStep      = 1;
         }
 
         virtual ~LLPath();