aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloateranimpreview.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-12-01 17:39:58 -0600
committerJacek Antonelli2008-12-01 17:40:06 -0600
commit7abecb48babe6a6f09bf6692ba55076546cfced9 (patch)
tree8d18a88513fb97adf32c10aae78f4be1984942db /linden/indra/newview/llfloateranimpreview.cpp
parentSecond Life viewer sources 1.21.6 (diff)
downloadmeta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.zip
meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.gz
meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.bz2
meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.xz
Second Life viewer sources 1.22.0-RC
Diffstat (limited to 'linden/indra/newview/llfloateranimpreview.cpp')
-rw-r--r--linden/indra/newview/llfloateranimpreview.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloateranimpreview.cpp b/linden/indra/newview/llfloateranimpreview.cpp
index 66b7a56..95c18df 100644
--- a/linden/indra/newview/llfloateranimpreview.cpp
+++ b/linden/indra/newview/llfloateranimpreview.cpp
@@ -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 );