diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-05-06 16:48:58 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2024-05-06 16:48:58 -0500 |
| commit | c6d752b880cacca8fb8f10f28790a50161fcb9ab (patch) | |
| tree | 14910a69597962134f2e78e864a2f05962a16356 /indra/newview/llviewerpartsource.cpp | |
| parent | 76101843c0d390c25a783f212eb1ea75e508ada4 (diff) | |
| parent | 7d87e41bbd5d4761b1eb17e49b7a00b948d84213 (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge
Diffstat (limited to 'indra/newview/llviewerpartsource.cpp')
| -rw-r--r-- | indra/newview/llviewerpartsource.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/llviewerpartsource.cpp b/indra/newview/llviewerpartsource.cpp index 1751ee1ebb..aa62df176f 100644 --- a/indra/newview/llviewerpartsource.cpp +++ b/indra/newview/llviewerpartsource.cpp @@ -66,8 +66,8 @@ LLViewerPartSource::LLViewerPartSource(const U32 type) : { mLastUpdateTime = 0.f; mLastPartTime = 0.f; - mIsDead = FALSE; - mIsSuspended = FALSE; + mIsDead = false; + mIsSuspended = false; static U32 id_seed = 0; mID = ++id_seed; @@ -78,7 +78,7 @@ LLViewerPartSource::LLViewerPartSource(const U32 type) : void LLViewerPartSource::setDead() { - mIsDead = TRUE; + mIsDead = true; } @@ -122,7 +122,7 @@ LLViewerPartSourceScript::LLViewerPartSourceScript(LLViewerObject *source_objp) void LLViewerPartSourceScript::setDead() { - mIsDead = TRUE; + mIsDead = true; mSourceObjectp = NULL; mTargetObjectp = NULL; } @@ -207,17 +207,17 @@ void LLViewerPartSourceScript::update(const F32 dt) } } - BOOL first_run = FALSE; + bool first_run = false; if (old_update_time <= 0.f) { - first_run = TRUE; + first_run = true; } F32 max_time = llmax(1.f, 10.f*mPartSysData.mBurstRate); dt_update = llmin(max_time, dt_update); while ((dt_update > mPartSysData.mBurstRate) || first_run) { - first_run = FALSE; + first_run = false; // Update the rotation of the particle source by the angular velocity // First check to see if there is still an angular velocity. @@ -586,7 +586,7 @@ LLViewerPartSourceSpiral::LLViewerPartSourceSpiral(const LLVector3 &pos) : void LLViewerPartSourceSpiral::setDead() { - mIsDead = TRUE; + mIsDead = true; mSourceObjectp = NULL; } @@ -690,7 +690,7 @@ LLViewerPartSourceBeam::~LLViewerPartSourceBeam() void LLViewerPartSourceBeam::setDead() { - mIsDead = TRUE; + mIsDead = true; mSourceObjectp = NULL; mTargetObjectp = NULL; } @@ -843,7 +843,7 @@ LLViewerPartSourceChat::LLViewerPartSourceChat(const LLVector3 &pos) : void LLViewerPartSourceChat::setDead() { - mIsDead = TRUE; + mIsDead = true; mSourceObjectp = NULL; } |