diff options
author | Jacek Antonelli | 2008-08-15 23:44:58 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:58 -0500 |
commit | 089fc07d207c71ce1401e72f09c31ad8c45872e2 (patch) | |
tree | 0028955add042c6f45b47a7b774adeeac9c592cb /linden/indra/newview/llspatialpartition.h | |
parent | Second Life viewer sources 1.16.0.5 (diff) | |
download | meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.zip meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.gz meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.bz2 meta-impy-089fc07d207c71ce1401e72f09c31ad8c45872e2.tar.xz |
Second Life viewer sources 1.17.0.12
Diffstat (limited to 'linden/indra/newview/llspatialpartition.h')
-rw-r--r-- | linden/indra/newview/llspatialpartition.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/newview/llspatialpartition.h b/linden/indra/newview/llspatialpartition.h index 5f6d257..3046b73 100644 --- a/linden/indra/newview/llspatialpartition.h +++ b/linden/indra/newview/llspatialpartition.h | |||
@@ -166,7 +166,6 @@ public: | |||
166 | } eSetStateMode; | 166 | } eSetStateMode; |
167 | 167 | ||
168 | LLSpatialGroup(OctreeNode* node, LLSpatialPartition* part); | 168 | LLSpatialGroup(OctreeNode* node, LLSpatialPartition* part); |
169 | virtual ~LLSpatialGroup(); | ||
170 | 169 | ||
171 | BOOL isDead() { return isState(DEAD); } | 170 | BOOL isDead() { return isState(DEAD); } |
172 | BOOL isState(U32 state) const { return mState & state ? TRUE : FALSE; } | 171 | BOOL isState(U32 state) const { return mState & state ? TRUE : FALSE; } |
@@ -210,6 +209,8 @@ public: | |||
210 | virtual void handleChildRemoval(const OctreeNode* parent, const OctreeNode* child); | 209 | virtual void handleChildRemoval(const OctreeNode* parent, const OctreeNode* child); |
211 | 210 | ||
212 | protected: | 211 | protected: |
212 | virtual ~LLSpatialGroup(); | ||
213 | |||
213 | U32 mState; | 214 | U32 mState; |
214 | S32 mLODHash; | 215 | S32 mLODHash; |
215 | static S32 sLODSeed; | 216 | static S32 sLODSeed; |
@@ -343,11 +344,13 @@ public: | |||
343 | // class for creating bridges between spatial partitions | 344 | // class for creating bridges between spatial partitions |
344 | class LLSpatialBridge : public LLDrawable, public LLSpatialPartition | 345 | class LLSpatialBridge : public LLDrawable, public LLSpatialPartition |
345 | { | 346 | { |
347 | protected: | ||
348 | ~LLSpatialBridge(); | ||
349 | |||
346 | public: | 350 | public: |
347 | typedef std::vector<LLPointer<LLSpatialBridge> > bridge_vector_t; | 351 | typedef std::vector<LLPointer<LLSpatialBridge> > bridge_vector_t; |
348 | 352 | ||
349 | LLSpatialBridge(LLDrawable* root, U32 data_mask); | 353 | LLSpatialBridge(LLDrawable* root, U32 data_mask); |
350 | virtual ~LLSpatialBridge(); | ||
351 | 354 | ||
352 | virtual BOOL isSpatialBridge() const { return TRUE; } | 355 | virtual BOOL isSpatialBridge() const { return TRUE; } |
353 | 356 | ||