diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-14 14:54:54 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-14 14:54:54 -0500 |
| commit | 93fcff2b24328560508bec2fbdea81761722eab6 (patch) | |
| tree | 5876874e18c8e467dd3c4aa74d2f3015afe68543 /indra/newview/llspatialpartition.cpp | |
| parent | 9605da154efc0b4913bc68082b8876b660d205b1 (diff) | |
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 1c080a54b2..d82b62dc19 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -1847,12 +1847,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); |