aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltexlayer.cpp
diff options
context:
space:
mode:
authorArmin Weatherwax2010-06-10 10:51:50 +0200
committerJacek Antonelli2010-06-19 02:43:36 -0500
commit9645bd0d6efb34cda00787fd1b5de77f89cb4ee8 (patch)
tree83aba8be93c07facc22a4ccc9fa3e797231ed521 /linden/indra/newview/lltexlayer.cpp
parentApplied fixed patch for SNOW-712 (diff)
downloadmeta-impy-9645bd0d6efb34cda00787fd1b5de77f89cb4ee8.zip
meta-impy-9645bd0d6efb34cda00787fd1b5de77f89cb4ee8.tar.gz
meta-impy-9645bd0d6efb34cda00787fd1b5de77f89cb4ee8.tar.bz2
meta-impy-9645bd0d6efb34cda00787fd1b5de77f89cb4ee8.tar.xz
fix another issue with alpha
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/lltexlayer.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/lltexlayer.cpp b/linden/indra/newview/lltexlayer.cpp
index 664f4fd..ec63c8c 100644
--- a/linden/indra/newview/lltexlayer.cpp
+++ b/linden/indra/newview/lltexlayer.cpp
@@ -254,14 +254,16 @@ BOOL LLTexLayerSetBuffer::render()
254 } 254 }
255 else 255 else
256 { 256 {
257 mUploadPending = FALSE; 257 // mUploadPending = FALSE;//see...
258 mNeedsUpload = FALSE; 258 // mNeedsUpload = FALSE;// ...below...
259 LLVOAvatar* avatar = mTexLayerSet->getAvatar(); 259 LLVOAvatar* avatar = mTexLayerSet->getAvatar();
260 if (avatar) 260 if (avatar)
261 { 261 {
262 avatar->setNewBakedTexture(avatar->getBakedTE(mTexLayerSet), IMG_INVISIBLE); 262 avatar->setNewBakedTexture(avatar->getBakedTE(mTexLayerSet), IMG_INVISIBLE);
263 llinfos << "Invisible baked texture set for " << mTexLayerSet->getBodyRegion() << llendl; 263 llinfos << "Invisible baked texture set for " << mTexLayerSet->getBodyRegion() << llendl;
264 } 264 }
265 readBackAndUpload(); //... here: Opensim is not happy if we don't
266 //TODO: find out if SL is happy if we do
265 } 267 }
266 } 268 }
267 } 269 }