summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-03-30 16:01:17 -0400
committerLoren Shih <seraph@lindenlab.com>2010-03-30 16:01:17 -0400
commit715e38fb536a47ce6b1ad8655c90b36324860acb (patch)
tree204299e890900838e93fda74c5b0bbcfce5659fb /indra
parent909091cc0c85a8178ff7ed338de04b1bb882bd82 (diff)
EXT-6630 : INFRASTRUCTURE: Pull out -Keys functions from llagent into llagentcamera
Fix for S32/F32 mismatch.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llagentcamera.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llagentcamera.h b/indra/newview/llagentcamera.h
index 56a0e68bd1..3ba24ef32b 100644
--- a/indra/newview/llagentcamera.h
+++ b/indra/newview/llagentcamera.h
@@ -313,14 +313,14 @@ public:
S32 getAtKey() const { return mAtKey; }
S32 getWalkKey() const { return mWalkKey; }
S32 getLeftKey() const { return mLeftKey; }
- F32 getUpKey() const { return mUpKey; }
+ S32 getUpKey() const { return mUpKey; }
F32 getYawKey() const { return mYawKey; }
F32 getPitchKey() const { return mPitchKey; }
void setAtKey(S32 mag) { mAtKey = mag; }
void setWalkKey(S32 mag) { mWalkKey = mag; }
void setLeftKey(S32 mag) { mLeftKey = mag; }
- void setUpKey(F32 mag) { mUpKey = mag; }
+ void setUpKey(S32 mag) { mUpKey = mag; }
void setYawKey(F32 mag) { mYawKey = mag; }
void setPitchKey(F32 mag) { mPitchKey = mag; }