diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-06-07 00:47:05 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-06-07 00:47:05 +0000 |
| commit | 290f2f05f7c2c061ba82f83594e4f7fb6a043ced (patch) | |
| tree | 648819527f93c4b398aaace5fb456afc983c2b15 /indra/newview/llagent.h | |
| parent | 810a0b3dcee41ec657c94ccb26003b9b4e20e141 (diff) | |
svn merge -r 88991:89027 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-2-Server --> release
Due to the gnarly history of the source branch and merge history of release, combine with cmake header and gcc-fu, this was an "interesting" merge.
Diffstat (limited to 'indra/newview/llagent.h')
| -rw-r--r-- | indra/newview/llagent.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index b50fb745ca..281b2d0c88 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -525,7 +525,7 @@ public: BOOL sitCameraEnabled() { return mSitCameraEnabled; } - F32 getCurrentCameraBuildOffset() { return (F32)mCameraFocusOffset.magVec(); } + F32 getCurrentCameraBuildOffset() { return (F32)mCameraFocusOffset.length(); } // look at behavior BOOL setLookAt(ELookAtType target_type, LLViewerObject *object = NULL, LLVector3 position = LLVector3::zero); |