From 8538c0f35dc5fb780f02930256e627e5266ede4a Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:49 -0500
Subject: Second Life viewer sources 1.20.6

---
 linden/indra/newview/lltoolmorph.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'linden/indra/newview/lltoolmorph.cpp')

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)
 //-----------------------------------------------------------------------------
 BOOL LLVisualParamHint::render()
 {
-	gGL.start();
-	
 	LLVisualParamReset::sDirty = TRUE;
 	LLVOAvatar* avatarp = gAgent.getAvatarObject();
 
@@ -224,7 +222,7 @@ BOOL LLVisualParamHint::render()
 		mVisualParam->getCameraElevation() );
 	LLVector3 camera_pos = target_joint_pos + (camera_snapshot_offset * avatar_rotation);
 	
-	gGL.stop();
+	gGL.flush();
 	
 	LLViewerCamera::getInstance()->setAspect((F32)mWidth / (F32)mHeight);
 	LLViewerCamera::getInstance()->setOriginAndLookAt(
@@ -241,7 +239,7 @@ BOOL LLVisualParamHint::render()
 		avatarPoolp->renderAvatars(avatarp);  // renders only one avatar
 	}
 	avatarp->setVisualParamWeight(mVisualParam, mLastParamWeight);
-
+	gGL.color4f(1,1,1,1);
 	return TRUE;
 }
 
@@ -258,7 +256,7 @@ void LLVisualParamHint::draw()
 	gGL.color4f(1.f, 1.f, 1.f, 1.f);
 
 	LLGLSUIDefault gls_ui;
-	gGL.begin(GL_QUADS);
+	gGL.begin(LLVertexBuffer::QUADS);
 	{
 		gGL.texCoord2i(0, 1);
 		gGL.vertex2i(0, mHeight);
-- 
cgit v1.1