diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-11-21 11:20:45 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-11-21 11:20:45 -0700 |
| commit | c14ecc817895d06b04a803a88d00d4ae1c80060a (patch) | |
| tree | d360b01bb2ff7065bc2d7608d094bce960e7f16a /indra/newview/llvieweroctree.cpp | |
| parent | 5979467198e9a8d4c065de908cf48c7d73101cd7 (diff) | |
fix for SH-4629: Interesting: crash at LLViewerRegion::killObject
Diffstat (limited to 'indra/newview/llvieweroctree.cpp')
| -rw-r--r-- | indra/newview/llvieweroctree.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llvieweroctree.cpp b/indra/newview/llvieweroctree.cpp index 62d34d12b5..201677b3de 100644 --- a/indra/newview/llvieweroctree.cpp +++ b/indra/newview/llvieweroctree.cpp @@ -268,6 +268,10 @@ void LLViewerOctreeEntry::removeData(LLViewerOctreeEntryData* data) { return; } + if(mData[data->getDataType()] != data) + { + return; + } mData[data->getDataType()] = NULL; |