diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloateranimpreview.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/linden/indra/newview/llfloateranimpreview.cpp b/linden/indra/newview/llfloateranimpreview.cpp index 66b7a56..c75f9e3 100644 --- a/linden/indra/newview/llfloateranimpreview.cpp +++ b/linden/indra/newview/llfloateranimpreview.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2004&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2004&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2004-2008, Linden Research, Inc. | 7 | * Copyright (c) 2004-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -384,9 +384,10 @@ void LLFloaterAnimPreview::draw() | |||
384 | if (mMotionID.notNull() && mAnimPreview) | 384 | if (mMotionID.notNull() && mAnimPreview) |
385 | { | 385 | { |
386 | gGL.color3f(1.f, 1.f, 1.f); | 386 | gGL.color3f(1.f, 1.f, 1.f); |
387 | mAnimPreview->bindTexture(); | ||
388 | 387 | ||
389 | gGL.begin( LLVertexBuffer::QUADS ); | 388 | gGL.getTexUnit(0)->bind(mAnimPreview->getTexture()); |
389 | |||
390 | gGL.begin( LLRender::QUADS ); | ||
390 | { | 391 | { |
391 | gGL.texCoord2f(0.f, 1.f); | 392 | gGL.texCoord2f(0.f, 1.f); |
392 | gGL.vertex2i(PREVIEW_HPAD, PREVIEW_TEXTURE_HEIGHT); | 393 | gGL.vertex2i(PREVIEW_HPAD, PREVIEW_TEXTURE_HEIGHT); |
@@ -399,7 +400,7 @@ void LLFloaterAnimPreview::draw() | |||
399 | } | 400 | } |
400 | gGL.end(); | 401 | gGL.end(); |
401 | 402 | ||
402 | mAnimPreview->unbindTexture(); | 403 | gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); |
403 | 404 | ||
404 | LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar(); | 405 | LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar(); |
405 | if (!avatarp->areAnimationsPaused()) | 406 | if (!avatarp->areAnimationsPaused()) |
@@ -1068,7 +1069,7 @@ BOOL LLPreviewAnimation::render() | |||
1068 | glLoadIdentity(); | 1069 | glLoadIdentity(); |
1069 | 1070 | ||
1070 | LLGLSUIDefault def; | 1071 | LLGLSUIDefault def; |
1071 | LLGLSNoTexture gls_no_texture; | 1072 | gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); |
1072 | gGL.color4f(0.15f, 0.2f, 0.3f, 1.f); | 1073 | gGL.color4f(0.15f, 0.2f, 0.3f, 1.f); |
1073 | 1074 | ||
1074 | gl_rect_2d_simple( mWidth, mHeight ); | 1075 | gl_rect_2d_simple( mWidth, mHeight ); |