diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-17 15:27:39 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-17 15:27:39 -0700 |
| commit | c320b4878ae9cd166594285a88437f0d5c333353 (patch) | |
| tree | d4b8f11a01bfbeb30cd8e8de96e8c12a1364ff47 /indra/newview/llspatialpartition.cpp | |
| parent | 3ee73ee98d31e572e284371074b7cd4744005a29 (diff) | |
| parent | 33bd704c58fa707d0a4cc89216538c9d64d6e109 (diff) | |
merging in latest code
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
| -rw-r--r-- | indra/newview/llspatialpartition.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index e62c9c3da5..6acbf82fd7 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -1859,6 +1859,8 @@ BOOL LLSpatialPartition::remove(LLDrawable *drawablep, LLSpatialGroup *curp) drawablep->setSpatialGroup(NULL); } + drawablep->setSpatialGroup(NULL); + assert_octree_valid(mOctree); return TRUE; @@ -4194,7 +4196,7 @@ public: { if (index < 255) { - if (facep->mDrawInfo->mTextureList.size()<= index) + if (facep->mDrawInfo->mTextureList.size() <= index) { llerrs << "Face texture index out of bounds." << llendl; } |