diff options
author | Dave Parks <davep@lindenlab.com> | 2012-10-10 14:13:52 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-10-10 14:13:52 -0500 |
commit | 830ecff00bd8a4111169ed52bec2384122ff2c01 (patch) | |
tree | 0b27d3f108098e51f60410caaff3dcddf8c0f018 | |
parent | 4a3bdb689673adfb3d4821b625d6af182de90eee (diff) |
DRTVWR-225 Cleanup assertions
-rw-r--r-- | indra/newview/lldrawable.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp index 55c780ecba..a0289cd2af 100644 --- a/indra/newview/lldrawable.cpp +++ b/indra/newview/lldrawable.cpp @@ -990,9 +990,12 @@ void LLDrawable::setSpatialGroup(LLSpatialGroup *groupp) } } - mSpatialGroupp = groupp; + //postcondition: if next group is NULL, previous group must be dead OR NULL OR binIndex must be -1 + //postcondition: if next group is NOT NULL, binIndex must not be -1 + llassert(groupp == NULL ? (mSpatialGroupp == NULL || mSpatialGroupp->isDead()) || getBinIndex() == -1 : + getBinIndex() != -1); - llassert((mSpatialGroupp == NULL) ? getBinIndex() == -1 : getBinIndex() != -1); + mSpatialGroupp = groupp; } LLSpatialPartition* LLDrawable::getSpatialPartition() |