From 446c55538e1fb12d8a1feb541edf99c16bb29121 Mon Sep 17 00:00:00 2001
From: Mark Palange <palange@lindenlab.com>
Date: Tue, 13 Jan 2009 03:46:56 +0000
Subject: svn merge -r106055-107012
 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/ merge RC5
 changes into trunk, plus add'l localization xml (all newly added) files that
 should have been added with RC0-RC4 merge, but weren't.

---
 indra/newview/lltoolmorph.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp
index 4ddb1ebd13..f15f0f44b0 100644
--- a/indra/newview/lltoolmorph.cpp
+++ b/indra/newview/lltoolmorph.cpp
@@ -241,7 +241,7 @@ BOOL LLVisualParamHint::render()
 	}
 	avatarp->setVisualParamWeight(mVisualParam, mLastParamWeight);
 	gGL.color4f(1,1,1,1);
-	mTexture->setInitialized(true);
+	mTexture->setGLTextureCreated(true);
 	return TRUE;
 }
 
-- 
cgit v1.2.3