diff options
author | Erik Kundiman <erik@megapahit.org> | 2024-07-27 15:17:57 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2024-07-28 08:24:59 +0800 |
commit | 96a81b5ecbe3bffb582ded930752c0523df5e80a (patch) | |
tree | a87a0bd09fd980562e88150dbfea3819d28d9f12 /indra/newview/llsprite.cpp | |
parent | 06e8f0c443c1ba7858d000c6d695b7e988e02053 (diff) | |
parent | ed73208eb96b862b97fa285036edea1e792ca3c6 (diff) |
Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into 2024.06-atlasaurus
Diffstat (limited to 'indra/newview/llsprite.cpp')
-rw-r--r-- | indra/newview/llsprite.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llsprite.cpp b/indra/newview/llsprite.cpp index 60cc406742..e51aeb6080 100644 --- a/indra/newview/llsprite.cpp +++ b/indra/newview/llsprite.cpp @@ -60,8 +60,8 @@ LLSprite::LLSprite(const LLUUID &image_uuid) : mPitch(0.f), mYaw(0.f), mPosition(0.0f, 0.0f, 0.0f), - mFollow(TRUE), - mUseCameraUp(TRUE), + mFollow(true), + mUseCameraUp(true), mColor(0.5f, 0.5f, 0.5f, 1.0f), mTexMode(GL_REPLACE) { @@ -266,12 +266,12 @@ void LLSprite::setYaw(F32 yaw) mYaw = yaw; } -void LLSprite::setFollow(const BOOL follow) +void LLSprite::setFollow(const bool follow) { mFollow = follow; } -void LLSprite::setUseCameraUp(const BOOL use_up) +void LLSprite::setUseCameraUp(const bool use_up) { mUseCameraUp = use_up; } |