diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-18 10:20:51 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-18 10:20:51 -0400 |
| commit | 469ce412e3c98273a4c2503969b1ab5e7ad055b5 (patch) | |
| tree | 0a110a373ee2f7d61359cd4b3b87df122736c17b /indra/newview/llwearable.cpp | |
| parent | b6ed10e8285e4abef4f14c618186984ef4b2cf7f (diff) | |
| parent | b416dcb73b1f405ebf5260cc588b07fde7ad1604 (diff) | |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llwearable.cpp')
| -rw-r--r-- | indra/newview/llwearable.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp index 3ecd1296bd..28613c8bcf 100644 --- a/indra/newview/llwearable.cpp +++ b/indra/newview/llwearable.cpp @@ -442,6 +442,9 @@ BOOL LLWearable::importFile( LLFILE* file ) delete mSavedTEMap[te]; } + image->setLoadedCallback(LLVOAvatarSelf::onTimingLocalTexLoaded,0,TRUE,FALSE, new LLVOAvatarSelf::LLAvatarTexData(id, (LLVOAvatarDefines::ETextureIndex)te)); + + LLUUID textureid(text_buffer); mTEMap[te] = new LLLocalTextureObject(image, textureid); mSavedTEMap[te] = new LLLocalTextureObject(image, textureid); |