summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2007-06-04 18:46:59 +0000
committerJosh Bell <josh@lindenlab.com>2007-06-04 18:46:59 +0000
commite61a10ec5b6b84fcb5c27e8e308022d0094f8736 (patch)
treebcf6152629edb1b2548af039bd89b6b573e1e514 /indra/llmath
parent3e9872a297c3cf3f929e688e0e89a78f6bc050f5 (diff)
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/llmath')
-rw-r--r--indra/llmath/lloctree.h1
-rw-r--r--indra/llmath/lltreenode.h1
-rw-r--r--indra/llmath/llvolume.h22
3 files changed, 13 insertions, 11 deletions
diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h
index f7ad363206..97f9576767 100644
--- a/indra/llmath/lloctree.h
+++ b/indra/llmath/lloctree.h
@@ -37,7 +37,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/indra/llmath/lltreenode.h b/indra/llmath/lltreenode.h
index cdc52cf90a..67c6cb631a 100644
--- a/indra/llmath/lltreenode.h
+++ b/indra/llmath/lltreenode.h
@@ -37,7 +37,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/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
index 3ce3058887..23c29ae310 100644
--- a/indra/llmath/llvolume.h
+++ b/indra/llmath/llvolume.h
@@ -615,12 +615,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();
@@ -690,11 +692,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();