diff options
| author | Karl Steifvater <qarl@lindenlab.com> | 2008-07-22 20:12:37 +0000 |
|---|---|---|
| committer | Karl Steifvater <qarl@lindenlab.com> | 2008-07-22 20:12:37 +0000 |
| commit | df4f20d4f51e41355e876f734527b4245543415c (patch) | |
| tree | 36aaf66ddb96b27fb9701764153cd7d17add275a /indra/newview/llagent.h | |
| parent | 0c0391cc7114bd2e9e4462c40e88814326f61bc2 (diff) | |
merge uv-picking branch.
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
Diffstat (limited to 'indra/newview/llagent.h')
| -rw-r--r-- | indra/newview/llagent.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index 45006fef8d..ea9138fdd1 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -95,6 +95,7 @@ class LLMessageSystem; class LLPermissions; class LLHost; class LLFriendObserver; +class LLPickInfo; struct LLGroupData { @@ -191,6 +192,7 @@ public: void changeCameraToFollow(BOOL animate = TRUE); //end Ventrella + void setFocusGlobal(const LLPickInfo& pick); void setFocusGlobal(const LLVector3d &focus, const LLUUID &object_id = LLUUID::null); void setFocusOnAvatar(BOOL focus, BOOL animate); void setCameraPosAndFocusGlobal(const LLVector3d& pos, const LLVector3d& focus, const LLUUID &object_id); @@ -374,7 +376,7 @@ public: void sendAnimationRequests(LLDynamicArray<LLUUID> &anim_ids, EAnimRequest request); void sendAnimationRequest(const LLUUID &anim_id, EAnimRequest request); - LLVector3d calcFocusOffset(LLViewerObject *object, S32 x, S32 y); + LLVector3 calcFocusOffset(LLViewerObject *object, S32 x, S32 y); BOOL calcCameraMinDistance(F32 &obj_min_distance); void startCameraAnimation(); @@ -711,6 +713,9 @@ public: LLDynamicArray<LLGroupData> mGroups; + F32 mHUDTargetZoom; // target zoom level for HUD objects (used when editing) + F32 mHUDCurZoom; // current animated zoom level for HUD objects + BOOL mInitialized; static BOOL sDebugDisplayTarget; @@ -786,6 +791,7 @@ private: LLVector3 mSitCameraFocus; // root relative camera target when sitting LLVector3d mCameraSmoothingLastPositionGlobal; LLVector3d mCameraSmoothingLastPositionAgent; + //Ventrella LLVector3 mCameraUpVector; // camera's up direction in world coordinates (determines the 'roll' of the view) |