Skip to content
Snippets Groups Projects
Commit 50c8c0fc authored by Xiaohong Bao's avatar Xiaohong Bao
Browse files

fix for SH-4521: Interesting viewer crash in Pipeline:RenderDrawPools

parent 1aa9ad57
No related branches found
No related tags found
No related merge requests found
...@@ -83,7 +83,9 @@ class LLViewerOctreeEntry : public LLRefCount ...@@ -83,7 +83,9 @@ class LLViewerOctreeEntry : public LLRefCount
NUM_DATA_TYPE NUM_DATA_TYPE
}eEntryDataType_t; }eEntryDataType_t;
~LLViewerOctreeEntry(); protected:
virtual ~LLViewerOctreeEntry();
public: public:
LLViewerOctreeEntry(); LLViewerOctreeEntry();
...@@ -187,7 +189,7 @@ class LLviewerOctreeGroup : public LLOctreeListener<LLViewerOctreeEntry> ...@@ -187,7 +189,7 @@ class LLviewerOctreeGroup : public LLOctreeListener<LLViewerOctreeEntry>
{ {
friend class LLViewerOctreeCull; friend class LLViewerOctreeCull;
protected: protected:
~LLviewerOctreeGroup(); virtual ~LLviewerOctreeGroup();
public: public:
enum enum
...@@ -303,13 +305,15 @@ class LLOcclusionCullingGroup : public LLviewerOctreeGroup ...@@ -303,13 +305,15 @@ class LLOcclusionCullingGroup : public LLviewerOctreeGroup
STATE_MODE_ALL_CAMERAS, //used for occlusion state, set state for all cameras STATE_MODE_ALL_CAMERAS, //used for occlusion state, set state for all cameras
} eSetStateMode; } eSetStateMode;
protected:
virtual ~LLOcclusionCullingGroup();
public: public:
LLOcclusionCullingGroup(OctreeNode* node, LLViewerOctreePartition* part); LLOcclusionCullingGroup(OctreeNode* node, LLViewerOctreePartition* part);
LLOcclusionCullingGroup(const LLOcclusionCullingGroup& rhs) : LLviewerOctreeGroup(rhs) LLOcclusionCullingGroup(const LLOcclusionCullingGroup& rhs) : LLviewerOctreeGroup(rhs)
{ {
*this = rhs; *this = rhs;
} }
~LLOcclusionCullingGroup();
void setOcclusionState(U32 state, S32 mode = STATE_MODE_SINGLE); void setOcclusionState(U32 state, S32 mode = STATE_MODE_SINGLE);
void clearOcclusionState(U32 state, S32 mode = STATE_MODE_SINGLE); void clearOcclusionState(U32 state, S32 mode = STATE_MODE_SINGLE);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment