diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-02 16:48:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-02 16:48:56 -0400 |
| commit | 02afdef3698ae17ef19ea17956c285d2523b142d (patch) | |
| tree | 87b690edc66e0e43f4910880205e01630febb998 /indra/newview/llviewerobjectlist.cpp | |
| parent | 1a872c7bf8b6aaf3d40e2c51b7f5fabebaba62de (diff) | |
| parent | 1f305e8624e130683fc5d8fceac7a8159515376b (diff) | |
merge back fixes from 3.4.1-beta12
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index e399b45cba..3eeab0bf3e 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -1446,8 +1446,11 @@ void LLViewerObjectList::updateActive(LLViewerObject *objectp) } } - llassert(objectp->isActive() || objectp->getListIndex() == -1); + //post condition: if object is active, it must be on the active list + llassert(!active || std::find(mActiveObjects.begin(), mActiveObjects.end(), objectp) != mActiveObjects.end()); + //post condition: if object is not active, it must not be on the active list + llassert(active || std::find(mActiveObjects.begin(), mActiveObjects.end(), objectp) == mActiveObjects.end()); } void LLViewerObjectList::updateObjectCost(LLViewerObject* object) |