diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-01-09 22:43:10 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-01-09 22:43:10 -0700 |
| commit | 7cc37d949e9319a5b60641ff8453a0fed763d817 (patch) | |
| tree | 366eeb2e217c26f589fa98c8e777a38d22c6df3b /indra/newview/llspatialpartition.cpp | |
| parent | 8315e9745398c1c3215ffe1b3bfbfb6c7d16291d (diff) | |
fix the merge errors from the changeset 3eadda9666cf
Diffstat (limited to 'indra/newview/llspatialpartition.cpp')
| -rw-r--r-- | indra/newview/llspatialpartition.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index bcafe2e008..0e2109c4af 100644 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -1549,8 +1549,6 @@ BOOL LLSpatialPartition::remove(LLDrawable *drawablep, LLSpatialGroup *curp) drawablep->setGroup(NULL); } - drawablep->setSpatialGroup(NULL); - assert_octree_valid(mOctree); return TRUE; |