diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-09-20 10:00:56 -0400 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-09-20 10:00:56 -0400 |
| commit | b5e71964e5f2b6cfa792cc30f7f694ee7096c828 (patch) | |
| tree | b37a27f81f45d8e19556c4c39246bcd19f5aea72 /indra/newview/llspatialpartition.cpp | |
| parent | 683c43c2e0f6e4d34592528c219f34f638059223 (diff) | |
reapply c77cea5c6e41: MAINT-646 Cleanup some warnings from previous changes.
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
| -rw-r--r-- | indra/newview/llspatialpartition.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index d4a3e9d8f5..78c905f6ff 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -1850,12 +1850,14 @@ 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; } + else + { + drawablep->setSpatialGroup(NULL); + } assert_octree_valid(mOctree); |