Merge recent changes

1 files changed, 13 insertions, 13 deletions

diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp
index af0d784a3e..ae3f2f55de 100644
--- a/indra/newview/lltoolmorph.cpp
+++ b/indra/newview/lltoolmorph.cpp
@@ -58,7 +58,7 @@
 #include "lltoolmgr.h"
 #include "llui.h"
 #include "llviewercamera.h"
-#include "llviewerimagelist.h"
+#include "llviewertexturelist.h"
 #include "llviewerobject.h"
 #include "llviewerwindow.h"
 #include "llvoavatarself.h"
@@ -81,7 +81,7 @@ LLVisualParamHint::LLVisualParamHint(
 	LLViewerVisualParam *param,
 	F32 param_weight)
 	:
-	LLDynamicTexture(width, height, 3, LLDynamicTexture::ORDER_MIDDLE, TRUE ),
+	LLViewerDynamicTexture(width, height, 3, LLViewerDynamicTexture::ORDER_MIDDLE, TRUE ),
 	mNeedsUpdate( TRUE ),
 	mIsVisible( FALSE ),
 	mJointMesh( mesh ),
@@ -155,7 +155,7 @@ void LLVisualParamHint::preRender(BOOL clear_depth)
 	avatarp->updateGeometry(avatarp->mDrawable);
 	avatarp->updateLOD();
 
-	LLDynamicTexture::preRender(clear_depth);
+	LLViewerDynamicTexture::preRender(clear_depth);
 }
 
 //-----------------------------------------------------------------------------
@@ -169,7 +169,7 @@ BOOL LLVisualParamHint::render()
 	glMatrixMode(GL_PROJECTION);
 	glPushMatrix();
 	glLoadIdentity();
-	glOrtho(0.0f, mWidth, 0.0f, mHeight, -1.0f, 1.0f);
+	glOrtho(0.0f, mFullWidth, 0.0f, mFullHeight, -1.0f, 1.0f);
 
 	glMatrixMode(GL_MODELVIEW);
 	glPushMatrix();
@@ -177,7 +177,7 @@ BOOL LLVisualParamHint::render()
 
 	LLGLSUIDefault gls_ui;
 	//LLGLState::verify(TRUE);
-	mBackgroundp->draw(0, 0, mWidth, mHeight);
+	mBackgroundp->draw(0, 0, mFullWidth, mFullHeight);
 
 	glMatrixMode(GL_PROJECTION);
 	glPopMatrix();
@@ -224,13 +224,13 @@ BOOL LLVisualParamHint::render()
 	
 	gGL.flush();
 	
-	LLViewerCamera::getInstance()->setAspect((F32)mWidth / (F32)mHeight);
+	LLViewerCamera::getInstance()->setAspect((F32)mFullWidth / (F32)mFullHeight);
 	LLViewerCamera::getInstance()->setOriginAndLookAt(
 		camera_pos,		// camera
 		LLVector3(0.f, 0.f, 1.f),						// up
 		target_pos );	// point of interest
 
-	LLViewerCamera::getInstance()->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mWidth, mHeight, FALSE);
+	LLViewerCamera::getInstance()->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mFullWidth, mFullHeight, FALSE);
 
 	if (avatarp->mDrawable.notNull())
 	{
@@ -244,7 +244,7 @@ BOOL LLVisualParamHint::render()
 	}
 	avatarp->setVisualParamWeight(mVisualParam, mLastParamWeight);
 	gGL.color4f(1,1,1,1);
-	mTexture->setGLTextureCreated(true);
+	mGLTexturep->setGLTextureCreated(true);
 	return TRUE;
 }
 
@@ -256,7 +256,7 @@ void LLVisualParamHint::draw()
 {
 	if (!mIsVisible) return;
 
-	gGL.getTexUnit(0)->bind(getTexture());
+	gGL.getTexUnit(0)->bind(this);
 
 	gGL.color4f(1.f, 1.f, 1.f, 1.f);
 
@@ -264,13 +264,13 @@ void LLVisualParamHint::draw()
 	gGL.begin(LLRender::QUADS);
 	{
 		gGL.texCoord2i(0, 1);
-		gGL.vertex2i(0, mHeight);
+		gGL.vertex2i(0, mFullHeight);
 		gGL.texCoord2i(0, 0);
 		gGL.vertex2i(0, 0);
 		gGL.texCoord2i(1, 0);
-		gGL.vertex2i(mWidth, 0);
+		gGL.vertex2i(mFullWidth, 0);
 		gGL.texCoord2i(1, 1);
-		gGL.vertex2i(mWidth, mHeight);
+		gGL.vertex2i(mFullWidth, mFullHeight);
 	}
 	gGL.end();
 
@@ -280,7 +280,7 @@ void LLVisualParamHint::draw()
 //-----------------------------------------------------------------------------
 // LLVisualParamReset()
 //-----------------------------------------------------------------------------
-LLVisualParamReset::LLVisualParamReset() : LLDynamicTexture(1, 1, 1, ORDER_RESET, FALSE)
+LLVisualParamReset::LLVisualParamReset() : LLViewerDynamicTexture(1, 1, 1, ORDER_RESET, FALSE)
 {	
 }