diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-16 15:19:31 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-16 15:19:31 -0700 |
| commit | 8f9da8b37d1983a2c2c69efec0ec9c8db9230c1a (patch) | |
| tree | f99f53363efaa8ebc6379aa7d6f0969760286d14 /indra/newview/llspatialpartition.cpp | |
| parent | 4ddd7968757393657055f61bb51bef7c6e721ebf (diff) | |
| parent | e7a5dc7cda09e65f8592793990c494a978a21271 (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
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; } |