diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-06-10 20:03:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-10 20:03:54 +0300 |
| commit | f74c10c4ec6435471bac84473fe865f90843c2df (patch) | |
| tree | b2853d87789dbb84d6c26c259eab6639d3a7e482 /indra/newview/llviewerpartsource.h | |
| parent | 5fccb539937a52d286274a002266e022e2102e5e (diff) | |
| parent | 32fcefc058ae38eff0572326ef3efd1c7b343144 (diff) | |
Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing
Diffstat (limited to 'indra/newview/llviewerpartsource.h')
| -rw-r--r-- | indra/newview/llviewerpartsource.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llviewerpartsource.h b/indra/newview/llviewerpartsource.h index 1f4304d421..dcf945dd43 100644 --- a/indra/newview/llviewerpartsource.h +++ b/indra/newview/llviewerpartsource.h @@ -58,12 +58,12 @@ public: LLViewerPartSource(const U32 type); - virtual void update(const F32 dt); // Return FALSE if this source is dead... + virtual void update(const F32 dt); // Return false if this source is dead... virtual void setDead(); - BOOL isDead() const { return mIsDead; } - void setSuspended( BOOL state ) { mIsSuspended = state; } - BOOL isSuspended() const { return mIsSuspended; } + bool isDead() const { return mIsDead; } + void setSuspended( bool state ) { mIsSuspended = state; } + bool isSuspended() const { return mIsSuspended; } U32 getType() const { return mType; } static void updatePart(LLViewerPart &part, const F32 dt); void setOwnerUUID(const LLUUID& owner_id) { mOwnerUUID = owner_id; } @@ -81,8 +81,8 @@ public: protected: U32 mType; - BOOL mIsDead; - BOOL mIsSuspended; + bool mIsDead; + bool mIsSuspended; F32 mLastUpdateTime; F32 mLastPartTime; LLUUID mOwnerUUID; @@ -112,7 +112,7 @@ public: /*virtual*/ void setDead(); - BOOL updateFromMesg(); + bool updateFromMesg(); // Returns a new particle source to attach to an object... static LLPointer<LLViewerPartSourceScript> unpackPSS(LLViewerObject *source_objp, LLPointer<LLViewerPartSourceScript> pssp, const S32 block_num); |