diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-08-13 15:32:47 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-08-13 15:32:47 -0400 |
| commit | 23f2631d598b6e07450a96ed1ec00670c8867cdd (patch) | |
| tree | 20195c1688ad8cb7e8631c97fa5920624f10972c /indra/newview/llmorphview.h | |
| parent | 54334ff6e377e35c97df3a0fe2a859795ec07b21 (diff) | |
| parent | 8ce3323269d95f54e2b768c4c5aa154d4afbbb6b (diff) | |
Merge branch 'develop' into nat/edu-channel
Diffstat (limited to 'indra/newview/llmorphview.h')
| -rw-r--r-- | indra/newview/llmorphview.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llmorphview.h b/indra/newview/llmorphview.h index f3af581a85..87f8c25f65 100644 --- a/indra/newview/llmorphview.h +++ b/indra/newview/llmorphview.h @@ -49,7 +49,7 @@ public: void shutdown(); // inherited methods - /*virtual*/ void setVisible(BOOL visible); + void setVisible(bool visible) override; void setCameraTargetJoint(LLJoint *joint) {mCameraTargetJoint = joint;} LLJoint* getCameraTargetJoint() {return mCameraTargetJoint;} @@ -58,7 +58,7 @@ public: void setCameraTargetOffset(const LLVector3d& camera_target_offset) {mCameraTargetOffset = camera_target_offset;} void updateCamera(); - void setCameraDrivenByKeys( BOOL b ); + void setCameraDrivenByKeys( bool b ); protected: void initialize(); @@ -75,7 +75,7 @@ protected: F32 mCameraPitch; F32 mCameraYaw; - BOOL mCameraDrivenByKeys; + bool mCameraDrivenByKeys; }; // |