diff options
author | Richard Linden <none@none> | 2010-07-01 10:36:03 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-07-01 10:36:03 -0700 |
commit | 166a29e4ebd63d893edf94e8e550e42f56e9bec1 (patch) | |
tree | e956e7e67bf4f0125353bf04d486f2103d44343e /indra/newview/llagentcamera.h | |
parent | 928b205329fb4392c6ed6b659f4ef7cda6e056d3 (diff) | |
parent | e8a52ebc51ebb27b7ffe3c9c275c04ccf3084bbb (diff) |
merge
Diffstat (limited to 'indra/newview/llagentcamera.h')
-rw-r--r-- | indra/newview/llagentcamera.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagentcamera.h b/indra/newview/llagentcamera.h index fc78fef6d0..6cee21fd8a 100644 --- a/indra/newview/llagentcamera.h +++ b/indra/newview/llagentcamera.h @@ -94,7 +94,7 @@ public: void changeCameraToDefault(); void changeCameraToMouselook(BOOL animate = TRUE); void changeCameraToThirdPerson(BOOL animate = TRUE); - void changeCameraToCustomizeAvatar(BOOL avatar_animate = TRUE, BOOL camera_animate = TRUE); // Trigger transition animation + void changeCameraToCustomizeAvatar(); // Trigger transition animation void changeCameraToFollow(BOOL animate = TRUE); // Ventrella BOOL cameraThirdPerson() const { return (mCameraMode == CAMERA_MODE_THIRD_PERSON && mLastCameraMode == CAMERA_MODE_THIRD_PERSON); } BOOL cameraMouselook() const { return (mCameraMode == CAMERA_MODE_MOUSELOOK && mLastCameraMode == CAMERA_MODE_MOUSELOOK); } |