diff options
author | dolphin <dolphin@lindenlab.com> | 2013-04-02 15:04:41 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-04-02 15:04:41 -0700 |
commit | f684d897f532bcba87cda1f72bd19efac82f6cb6 (patch) | |
tree | 6222ff28ee7825e987a127383a081297a80d7e6c /indra/newview/llvopartgroup.cpp | |
parent | 4bdecca57ec82a5dbc323432b7b5cb6aba9c1303 (diff) | |
parent | 90b56ee9fa95ca8cc15e3abc81977f504eb32c5b (diff) |
Merge with viewer-development
Diffstat (limited to 'indra/newview/llvopartgroup.cpp')
-rw-r--r-- | indra/newview/llvopartgroup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp index fa34a6f1f5..0b34bbb90f 100644 --- a/indra/newview/llvopartgroup.cpp +++ b/indra/newview/llvopartgroup.cpp @@ -152,8 +152,8 @@ bool ll_is_part_idx_allocated(S32 idx, S32* start, S32* end) void LLVOPartGroup::freeVBSlot(S32 idx) { llassert(idx < LL_MAX_PARTICLE_COUNT && idx >= 0); - llassert(sVBSlotCursor > sVBSlotFree); - llassert(ll_is_part_idx_allocated(idx, sVBSlotCursor, sVBSlotFree+LL_MAX_PARTICLE_COUNT)); + //llassert(sVBSlotCursor > sVBSlotFree); + //llassert(ll_is_part_idx_allocated(idx, sVBSlotCursor, sVBSlotFree+LL_MAX_PARTICLE_COUNT)); if (sVBSlotCursor > sVBSlotFree) { |