diff options
Diffstat (limited to 'linden/indra/newview/llviewerpartsim.h')
-rw-r--r-- | linden/indra/newview/llviewerpartsim.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewerpartsim.h b/linden/indra/newview/llviewerpartsim.h index 0f51240..81394e6 100644 --- a/linden/indra/newview/llviewerpartsim.h +++ b/linden/indra/newview/llviewerpartsim.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2003&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2003&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2003-2008, Linden Research, Inc. | 7 | * Copyright (c) 2003-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -87,7 +87,8 @@ class LLViewerPartGroup | |||
87 | { | 87 | { |
88 | public: | 88 | public: |
89 | LLViewerPartGroup(const LLVector3 ¢er, | 89 | LLViewerPartGroup(const LLVector3 ¢er, |
90 | const F32 box_radius); | 90 | const F32 box_radius, |
91 | bool hud); | ||
91 | virtual ~LLViewerPartGroup(); | 92 | virtual ~LLViewerPartGroup(); |
92 | 93 | ||
93 | void cleanup(); | 94 | void cleanup(); |
@@ -115,6 +116,7 @@ public: | |||
115 | U32 mID; | 116 | U32 mID; |
116 | 117 | ||
117 | F32 mSkippedTime; | 118 | F32 mSkippedTime; |
119 | bool mHud; | ||
118 | 120 | ||
119 | protected: | 121 | protected: |
120 | LLVector3 mCenterAgent; | 122 | LLVector3 mCenterAgent; |
@@ -178,7 +180,7 @@ public: | |||
178 | U32 mID; | 180 | U32 mID; |
179 | 181 | ||
180 | protected: | 182 | protected: |
181 | LLViewerPartGroup *createViewerPartGroup(const LLVector3 &pos_agent, const F32 desired_size); | 183 | LLViewerPartGroup *createViewerPartGroup(const LLVector3 &pos_agent, const F32 desired_size, bool hud); |
182 | LLViewerPartGroup *put(LLViewerPart* part); | 184 | LLViewerPartGroup *put(LLViewerPart* part); |
183 | 185 | ||
184 | group_list_t mViewerPartGroups; | 186 | group_list_t mViewerPartGroups; |
@@ -195,6 +197,12 @@ protected: | |||
195 | static const F32 PART_THROTTLE_RESCALE; | 197 | static const F32 PART_THROTTLE_RESCALE; |
196 | static const F32 PART_ADAPT_RATE_MULT; | 198 | static const F32 PART_ADAPT_RATE_MULT; |
197 | static const F32 PART_ADAPT_RATE_MULT_RECIP; | 199 | static const F32 PART_ADAPT_RATE_MULT_RECIP; |
200 | |||
201 | //debug use only | ||
202 | public: | ||
203 | static S32 sParticleCount2; | ||
204 | |||
205 | static void checkParticleCount(U32 size = 0) ; | ||
198 | }; | 206 | }; |
199 | 207 | ||
200 | #endif // LL_LLVIEWERPARTSIM_H | 208 | #endif // LL_LLVIEWERPARTSIM_H |