aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltoolmorph.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/lltoolmorph.cpp')
-rw-r--r--linden/indra/newview/lltoolmorph.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/linden/indra/newview/lltoolmorph.cpp b/linden/indra/newview/lltoolmorph.cpp
index 9acf3a0..a18321a 100644
--- a/linden/indra/newview/lltoolmorph.cpp
+++ b/linden/indra/newview/lltoolmorph.cpp
@@ -163,8 +163,6 @@ void LLVisualParamHint::preRender(BOOL clear_depth)
163//----------------------------------------------------------------------------- 163//-----------------------------------------------------------------------------
164BOOL LLVisualParamHint::render() 164BOOL LLVisualParamHint::render()
165{ 165{
166 gGL.start();
167
168 LLVisualParamReset::sDirty = TRUE; 166 LLVisualParamReset::sDirty = TRUE;
169 LLVOAvatar* avatarp = gAgent.getAvatarObject(); 167 LLVOAvatar* avatarp = gAgent.getAvatarObject();
170 168
@@ -224,7 +222,7 @@ BOOL LLVisualParamHint::render()
224 mVisualParam->getCameraElevation() ); 222 mVisualParam->getCameraElevation() );
225 LLVector3 camera_pos = target_joint_pos + (camera_snapshot_offset * avatar_rotation); 223 LLVector3 camera_pos = target_joint_pos + (camera_snapshot_offset * avatar_rotation);
226 224
227 gGL.stop(); 225 gGL.flush();
228 226
229 LLViewerCamera::getInstance()->setAspect((F32)mWidth / (F32)mHeight); 227 LLViewerCamera::getInstance()->setAspect((F32)mWidth / (F32)mHeight);
230 LLViewerCamera::getInstance()->setOriginAndLookAt( 228 LLViewerCamera::getInstance()->setOriginAndLookAt(
@@ -241,7 +239,7 @@ BOOL LLVisualParamHint::render()
241 avatarPoolp->renderAvatars(avatarp); // renders only one avatar 239 avatarPoolp->renderAvatars(avatarp); // renders only one avatar
242 } 240 }
243 avatarp->setVisualParamWeight(mVisualParam, mLastParamWeight); 241 avatarp->setVisualParamWeight(mVisualParam, mLastParamWeight);
244 242 gGL.color4f(1,1,1,1);
245 return TRUE; 243 return TRUE;
246} 244}
247 245
@@ -258,7 +256,7 @@ void LLVisualParamHint::draw()
258 gGL.color4f(1.f, 1.f, 1.f, 1.f); 256 gGL.color4f(1.f, 1.f, 1.f, 1.f);
259 257
260 LLGLSUIDefault gls_ui; 258 LLGLSUIDefault gls_ui;
261 gGL.begin(GL_QUADS); 259 gGL.begin(LLVertexBuffer::QUADS);
262 { 260 {
263 gGL.texCoord2i(0, 1); 261 gGL.texCoord2i(0, 1);
264 gGL.vertex2i(0, mHeight); 262 gGL.vertex2i(0, mHeight);