summaryrefslogtreecommitdiff
path: root/indra/newview/llvocache.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2013-06-13 18:47:51 -0600
committerXiaohong Bao <bao@lindenlab.com>2013-06-13 18:47:51 -0600
commitfc88265cffe3553803314c6e895a1e3a3c988171 (patch)
tree8e5113ddd5c8d7a2a2f0a8132e710515bd2678b0 /indra/newview/llvocache.cpp
parentdb2abd49c3b41af612cbb6fed4c1626c37b4e14b (diff)
fix for SH-4241: viewer crash shortly after login in LLViewerRegion::addNewObject and
SH-4261: interesting: crash in LLViewerRegion::addToVOCacheTree
Diffstat (limited to 'indra/newview/llvocache.cpp')
-rwxr-xr-xindra/newview/llvocache.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp
index 1f3af78e77..9816fb9af0 100755
--- a/indra/newview/llvocache.cpp
+++ b/indra/newview/llvocache.cpp
@@ -102,8 +102,7 @@ LLVOCacheEntry::LLVOCacheEntry(LLAPRFile* apr_file)
BOOL success;
mDP.assignBuffer(mBuffer, 0);
- setOctreeEntry(NULL);
-
+
success = check_read(apr_file, &mLocalID, sizeof(U32));
if(success)
{