diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-10-10 21:40:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-10-10 21:40:10 -0400 |
| commit | 1709952adbb3ad3ba4eb7d5be39c0c67c389c7c5 (patch) | |
| tree | ad71b6021639d4d9d89c9992aff13f000dd0248f /indra/newview/llspatialpartition.cpp | |
| parent | cb5a0a5686799ec834f16a0bc273d24f62140753 (diff) | |
| parent | 3f45fa719e4c72e528801d4d8330a114e5458f30 (diff) | |
pull back 3.4.1-beta6 fixes
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 06c87e57fc..b815439834 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; } |