diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-05-18 10:22:47 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-05-18 10:22:47 -0400 |
| commit | 9ce59060301601b1478337b0fd2e80d1b9624d77 (patch) | |
| tree | 2abf04427797facf52b4e16976441f5346aec3c8 /indra/newview/llwearable.cpp | |
| parent | 46d799ab51c6fe577f443f294bde68c3096a26dd (diff) | |
| parent | 469ce412e3c98273a4c2503969b1ab5e7ad055b5 (diff) | |
automated merge
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); |