diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2009-02-18 21:10:16 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2009-02-18 21:10:16 +0000 |
| commit | abdc99f21b542c4fea67030ddbd7166c9d1c6c63 (patch) | |
| tree | 3e984e405adfdec189ca8a047daca5250737ffbf /indra/newview/llagent.h | |
| parent | 34412f0530cf6a411b4de906a8e9da59cbcb3a85 (diff) | |
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
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 c9e256fbbc..9d08c94150 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -544,6 +544,7 @@ public: void setHomePosRegion( const U64& region_handle, const LLVector3& pos_region ); BOOL getHomePosGlobal( LLVector3d* pos_global ); void setCameraAnimating( BOOL b ) { mCameraAnimating = b; } + BOOL getCameraAnimating( ) { return mCameraAnimating; } void setAnimationDuration( F32 seconds ) { mAnimationDuration = seconds; } F32 getNearChatRadius() { return mNearChatRadius; } @@ -811,7 +812,6 @@ private: LLCoordFrame mFrameAgent; // Agent position and view, agent-region coordinates - BOOL mCrouching; BOOL mIsBusy; S32 mAtKey; // Either 1, 0, or -1... indicates that movement-key is pressed |