summaryrefslogtreecommitdiff
path: root/indra/newview/llmorphview.cpp
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2024-07-27 15:17:57 +0800
committerErik Kundiman <erik@megapahit.org>2024-07-28 08:24:59 +0800
commit96a81b5ecbe3bffb582ded930752c0523df5e80a (patch)
treea87a0bd09fd980562e88150dbfea3819d28d9f12 /indra/newview/llmorphview.cpp
parent06e8f0c443c1ba7858d000c6d695b7e988e02053 (diff)
parented73208eb96b862b97fa285036edea1e792ca3c6 (diff)
Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into 2024.06-atlasaurus
Diffstat (limited to 'indra/newview/llmorphview.cpp')
-rw-r--r--indra/newview/llmorphview.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llmorphview.cpp b/indra/newview/llmorphview.cpp
index 95c55f8a0c..a5fc813f2f 100644
--- a/indra/newview/llmorphview.cpp
+++ b/indra/newview/llmorphview.cpp
@@ -47,7 +47,7 @@
LLMorphView *gMorphView = NULL;
-const F32 MORPH_NEAR_CLIP = 0.1f;
+constexpr F32 MORPH_NEAR_CLIP = 0.1f;
//-----------------------------------------------------------------------------
// LLMorphView()
@@ -60,7 +60,7 @@ LLMorphView::LLMorphView(const LLMorphView::Params& p)
mOldCameraNearClip( 0.f ),
mCameraPitch( 0.f ),
mCameraYaw( 0.f ),
- mCameraDrivenByKeys( FALSE )
+ mCameraDrivenByKeys( false )
{}
//-----------------------------------------------------------------------------
@@ -103,7 +103,7 @@ void LLMorphView::shutdown()
//-----------------------------------------------------------------------------
// setVisible()
//-----------------------------------------------------------------------------
-void LLMorphView::setVisible(BOOL visible)
+void LLMorphView::setVisible(bool visible)
{
if( visible != getVisible() )
{
@@ -152,7 +152,7 @@ void LLMorphView::updateCamera()
gAgentCamera.setCameraPosAndFocusGlobal( camera_pos, target_pos, gAgent.getID() );
}
-void LLMorphView::setCameraDrivenByKeys(BOOL b)
+void LLMorphView::setCameraDrivenByKeys(bool b)
{
if( mCameraDrivenByKeys != b )
{