diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-04-02 12:51:39 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-04-02 12:51:39 -0400 |
| commit | 5faa2444f91a65b3dfcd2047e578a54226be8577 (patch) | |
| tree | 05b7468bc6b721d8f8e90cbb77a8f2f8a74ba152 /indra/newview/llagentcamera.h | |
| parent | a3ba5836f0b24a0b2c3aeff3b97bb88a133ea69c (diff) | |
| parent | a7085418df1ada6e19b94b6df772ed21e663d119 (diff) | |
merge
Diffstat (limited to 'indra/newview/llagentcamera.h')
| -rw-r--r-- | indra/newview/llagentcamera.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llagentcamera.h b/indra/newview/llagentcamera.h index 3ba24ef32b..5cbb1de6f4 100644 --- a/indra/newview/llagentcamera.h +++ b/indra/newview/llagentcamera.h @@ -82,7 +82,7 @@ public: void cleanup(); void setAvatarObject(LLVOAvatarSelf* avatar); private: - BOOL mInitialized; + bool mInitialized; //-------------------------------------------------------------------- @@ -151,7 +151,7 @@ private: LLVector3 mCameraVirtualPositionAgent; // Camera virtual position (target) before performing FOV zoom LLVector3d mCameraSmoothingLastPositionGlobal; LLVector3d mCameraSmoothingLastPositionAgent; - BOOL mCameraSmoothingStop; + bool mCameraSmoothingStop; LLVector3 mCameraLag; // Third person camera lag LLVector3 mCameraUpVector; // Camera's up direction in world coordinates (determines the 'roll' of the view) |