diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-03-29 10:53:22 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-03-29 10:53:22 -0400 |
| commit | 783eb286a67e6f9ace5561073a16c9c1b7f1ade5 (patch) | |
| tree | 1b4a6d5a81527202860d3cfc217c30d4e1a67880 /indra/newview/llmorphview.cpp | |
| parent | f428d62c93f2cd2817e055fce7db49410e8324d6 (diff) | |
| parent | 61657d2e7904ba7274a0ab5d451669d2ee7bb7cc (diff) | |
merge
Diffstat (limited to 'indra/newview/llmorphview.cpp')
| -rw-r--r-- | indra/newview/llmorphview.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llmorphview.cpp b/indra/newview/llmorphview.cpp index b95e8bd3a2..47234eb773 100644 --- a/indra/newview/llmorphview.cpp +++ b/indra/newview/llmorphview.cpp @@ -37,6 +37,7 @@ #include "lljoint.h" #include "llagent.h" +#include "llagentcamera.h" #include "lldrawable.h" #include "lldrawpoolavatar.h" #include "llface.h" @@ -91,7 +92,7 @@ void LLMorphView::initialize() LLVOAvatar *avatarp = gAgent.getAvatarObject(); if (!avatarp || avatarp->isDead()) { - gAgent.changeCameraToDefault(); + gAgentCamera.changeCameraToDefault(); return; } @@ -187,7 +188,7 @@ void LLMorphView::updateCamera() LLVector3d camera_pos = joint_pos + mCameraOffset * camera_rot_pitch * camera_rot_yaw * avatar_rot; - gAgent.setCameraPosAndFocusGlobal( camera_pos, target_pos, gAgent.getID() ); + gAgentCamera.setCameraPosAndFocusGlobal( camera_pos, target_pos, gAgent.getID() ); } void LLMorphView::setCameraDrivenByKeys(BOOL b) |