diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-10-04 20:12:51 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-10-04 20:12:51 -0400 |
| commit | 07899b2820599600fac889355c1742c81d69d051 (patch) | |
| tree | d6166632b77cf4428cbfbf0016c15a85ff87e515 /indra/newview/llspatialpartition.cpp | |
| parent | 7fe8e87d19f4940d9b682faa7e189d1b1ac18785 (diff) | |
| parent | a5e28651f539ff0f9bb9a678538d70b5fa9f97ba (diff) | |
merge changes for DRTVWR-222
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
| -rw-r--r-- | indra/newview/llspatialpartition.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 45ef8f1a6d..9a6cb78333 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -1841,13 +1841,13 @@ BOOL LLSpatialPartition::remove(LLDrawable *drawablep, LLSpatialGroup *curp) { LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION); - drawablep->setSpatialGroup(NULL); - if (!curp->removeObject(drawablep)) { OCT_ERRS << "Failed to remove drawable from octree!" << llendl; } + drawablep->setSpatialGroup(NULL); + assert_octree_valid(mOctree); return TRUE; |