aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterauction.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/llfloaterauction.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 '')
-rw-r--r--linden/indra/newview/llfloaterauction.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llfloaterauction.cpp b/linden/indra/newview/llfloaterauction.cpp
index 80c43ab..a5929fd 100644
--- a/linden/indra/newview/llfloaterauction.cpp
+++ b/linden/indra/newview/llfloaterauction.cpp
@@ -148,7 +148,7 @@ void LLFloaterAuction::draw()
148 if (childGetRect("snapshot_icon", rect)) 148 if (childGetRect("snapshot_icon", rect))
149 { 149 {
150 { 150 {
151 LLGLSNoTexture gls_no_texture; 151 gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
152 gl_rect_2d(rect, LLColor4(0.f, 0.f, 0.f, 1.f)); 152 gl_rect_2d(rect, LLColor4(0.f, 0.f, 0.f, 1.f));
153 rect.stretch(-1); 153 rect.stretch(-1);
154 } 154 }
@@ -205,7 +205,7 @@ void LLFloaterAuction::onClickSnapshot(void* data)
205 LLVFile::writeFile(j2c->getData(), j2c->getDataSize(), gVFS, self->mImageID, LLAssetType::AT_TEXTURE); 205 LLVFile::writeFile(j2c->getData(), j2c->getDataSize(), gVFS, self->mImageID, LLAssetType::AT_TEXTURE);
206 206
207 self->mImage = new LLImageGL((LLImageRaw*)raw, FALSE); 207 self->mImage = new LLImageGL((LLImageRaw*)raw, FALSE);
208 self->mImage->bind(); 208 gGL.getTexUnit(0)->bind(self->mImage);
209 self->mImage->setClamp(TRUE, TRUE); 209 self->mImage->setClamp(TRUE, TRUE);
210 } 210 }
211 else 211 else