diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-06-24 11:44:36 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-06-24 11:44:36 -0600 |
| commit | 6bb64e79985f0b724dd5b07703666e307a54a98b (patch) | |
| tree | 9fd53fecb74135b51339a432e6de9b6f72e04771 /indra/newview/llviewerregion.cpp | |
| parent | fe3cfb30d504155850ddf3752d2f55e6311990d6 (diff) | |
| parent | d95d69cbc4063fae1d93ce2f0c4d22d3ef9c8edd (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rwxr-xr-x | indra/newview/llviewerregion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 64b25f4b0b..dd4c7f2aff 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -992,7 +992,7 @@ void LLViewerRegion::removeFromVOCacheTree(LLVOCacheEntry* entry) //add the visible entries void LLViewerRegion::addVisibleCacheEntry(LLVOCacheEntry* entry) { - if(mDead || !entry) + if(mDead || !entry || !entry->getEntry()) { return; } |