aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltoolmorph.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:45 -0500
committerJacek Antonelli2008-08-15 23:45:45 -0500
commitb1831d23bfdd0c876ac8cf687d6d3cf02345e28e (patch)
treee977d6563859940ad05af08b7bc150f57a7cb548 /linden/indra/newview/lltoolmorph.cpp
parentSecond Life viewer sources 1.20.3 (diff)
downloadmeta-impy-b1831d23bfdd0c876ac8cf687d6d3cf02345e28e.zip
meta-impy-b1831d23bfdd0c876ac8cf687d6d3cf02345e28e.tar.gz
meta-impy-b1831d23bfdd0c876ac8cf687d6d3cf02345e28e.tar.bz2
meta-impy-b1831d23bfdd0c876ac8cf687d6d3cf02345e28e.tar.xz
Second Life viewer sources 1.20.4
Diffstat (limited to 'linden/indra/newview/lltoolmorph.cpp')
-rw-r--r--linden/indra/newview/lltoolmorph.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/linden/indra/newview/lltoolmorph.cpp b/linden/indra/newview/lltoolmorph.cpp
index 5b3f1eb..9acf3a0 100644
--- a/linden/indra/newview/lltoolmorph.cpp
+++ b/linden/indra/newview/lltoolmorph.cpp
@@ -163,6 +163,8 @@ void LLVisualParamHint::preRender(BOOL clear_depth)
163//----------------------------------------------------------------------------- 163//-----------------------------------------------------------------------------
164BOOL LLVisualParamHint::render() 164BOOL LLVisualParamHint::render()
165{ 165{
166 gGL.start();
167
166 LLVisualParamReset::sDirty = TRUE; 168 LLVisualParamReset::sDirty = TRUE;
167 LLVOAvatar* avatarp = gAgent.getAvatarObject(); 169 LLVOAvatar* avatarp = gAgent.getAvatarObject();
168 170
@@ -223,6 +225,7 @@ BOOL LLVisualParamHint::render()
223 LLVector3 camera_pos = target_joint_pos + (camera_snapshot_offset * avatar_rotation); 225 LLVector3 camera_pos = target_joint_pos + (camera_snapshot_offset * avatar_rotation);
224 226
225 gGL.stop(); 227 gGL.stop();
228
226 LLViewerCamera::getInstance()->setAspect((F32)mWidth / (F32)mHeight); 229 LLViewerCamera::getInstance()->setAspect((F32)mWidth / (F32)mHeight);
227 LLViewerCamera::getInstance()->setOriginAndLookAt( 230 LLViewerCamera::getInstance()->setOriginAndLookAt(
228 camera_pos, // camera 231 camera_pos, // camera
@@ -238,7 +241,7 @@ BOOL LLVisualParamHint::render()
238 avatarPoolp->renderAvatars(avatarp); // renders only one avatar 241 avatarPoolp->renderAvatars(avatarp); // renders only one avatar
239 } 242 }
240 avatarp->setVisualParamWeight(mVisualParam, mLastParamWeight); 243 avatarp->setVisualParamWeight(mVisualParam, mLastParamWeight);
241 gGL.start(); 244
242 return TRUE; 245 return TRUE;
243} 246}
244 247