diff options
| author | Simon Linden <simon@lindenlab.com> | 2013-03-19 16:20:53 -0700 |
|---|---|---|
| committer | Simon Linden <simon@lindenlab.com> | 2013-03-19 16:20:53 -0700 |
| commit | d5561a1ada5cf171c8e281e910a7e989496c3705 (patch) | |
| tree | 456cbb2374242d5508cc13165c876cd0672f6cd0 /indra/newview/llvopartgroup.cpp | |
| parent | a8245c51b9cd6fac1d26932dbb1fcf052f00da18 (diff) | |
| parent | 04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff) | |
Merge in viewer-beta to get CHUI code
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 53d67347d1..99b3accda8 100644 --- a/indra/newview/llvopartgroup.cpp +++ b/indra/newview/llvopartgroup.cpp @@ -143,8 +143,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) { |