diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-17 14:32:29 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-17 14:32:29 -0700 |
| commit | 9da9b2d84be4c9bb2f0f8208ada6f67e8a53a7e8 (patch) | |
| tree | b9f0da0557b8ec0e5a1d7599caa0389795457068 /indra/newview/llspatialpartition.cpp | |
| parent | 2f8e4f240881fe990699872eafb6d7dceb5e5a9f (diff) | |
| parent | a7f6dcaef7fb49901a2ebf0629e3089fa8cdad98 (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
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; } |