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

Automated merge with http://bitbucket.org/lindenlab/viewer-interesting

meow-7.2.2
Xiaohong Bao 2013-09-26 11:03:51 -06:00
parent 1aec07aecf 9053b9020a
commit 458990b435
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llmath/lltreenode.h
View File

@ -57,7 +57,14 @@ public:
virtual bool remove(T* data);
virtual void notifyRemoval(T* data);
virtual U32 getListenerCount() { return mListeners.size(); }
virtual LLTreeListener<T>* getListener(U32 index) const { return mListeners[index]; }
virtual LLTreeListener<T>* getListener(U32 index) const
{
if(index < mListeners.size())
{
return mListeners[index];
}
return NULL;
}
virtual void addListener(LLTreeListener<T>* listener) { mListeners.push_back(listener); }
protected:

2
indra/newview/llvieweroctree.cpp
View File

@ -957,7 +957,7 @@ public:
{
LLOcclusionCullingGroup* group = (LLOcclusionCullingGroup*) n->getListener(0);
if (group->isOcclusionState(mState))
if (group && group->isOcclusionState(mState))
{
OctreeTraveler::traverse(n);
}