livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

meow-7.2.2
Xiaohong Bao 2013-10-02 17:55:16 -06:00
parent 1aa9ad5754
commit 50c8c0fc78
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llvieweroctree.h
View File

@ -83,7 +83,9 @@ public:
NUM_DATA_TYPE
}eEntryDataType_t;
~LLViewerOctreeEntry();
protected:
virtual ~LLViewerOctreeEntry();
public:
LLViewerOctreeEntry();
@ -187,7 +189,7 @@ class LLviewerOctreeGroup : public LLOctreeListener<LLViewerOctreeEntry>
{
friend class LLViewerOctreeCull;
protected:
~LLviewerOctreeGroup();
virtual ~LLviewerOctreeGroup();
public:
enum
@ -303,13 +305,15 @@ public:
STATE_MODE_ALL_CAMERAS, //used for occlusion state, set state for all cameras
} eSetStateMode;
protected:
virtual ~LLOcclusionCullingGroup();
public:
LLOcclusionCullingGroup(OctreeNode* node, LLViewerOctreePartition* part);
LLOcclusionCullingGroup(const LLOcclusionCullingGroup& rhs) : LLviewerOctreeGroup(rhs)
{
*this = rhs;
}
~LLOcclusionCullingGroup();
}
void setOcclusionState(U32 state, S32 mode = STATE_MODE_SINGLE);
void clearOcclusionState(U32 state, S32 mode = STATE_MODE_SINGLE);