From 46f8fb8781ccce338b4a88aaf8371ee3dec56d29 Mon Sep 17 00:00:00 2001 From: Mark Palange Date: Tue, 3 Feb 2009 21:15:57 +0000 Subject: svn merge -r107016:108767 svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22 Merge back of viewer 1.22 RC6 and RC7 change to trunk. QAR-1214 and QAR-1227 --- indra/newview/llviewerpartsim.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/llviewerpartsim.h') diff --git a/indra/newview/llviewerpartsim.h b/indra/newview/llviewerpartsim.h index e50a1aef1c..21bc37f891 100644 --- a/indra/newview/llviewerpartsim.h +++ b/indra/newview/llviewerpartsim.h @@ -198,6 +198,12 @@ protected: static const F32 PART_THROTTLE_RESCALE; static const F32 PART_ADAPT_RATE_MULT; static const F32 PART_ADAPT_RATE_MULT_RECIP; + +//debug use only +public: + static S32 sParticleCount2; + + static void checkParticleCount(U32 size = 0) ; }; #endif // LL_LLVIEWERPARTSIM_H -- cgit v1.2.3