diff options
author | Richard Linden <none@none> | 2010-05-25 14:48:09 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-05-25 14:48:09 -0700 |
commit | b0bdde3ee307e144d9047521fce84c318b0fc789 (patch) | |
tree | 226860f78d30bd438a0b9fca2a9f94013c643188 /indra/newview/llwearable.cpp | |
parent | a91d10dc1806d1931c7f1361bfcf70df59d982d5 (diff) | |
parent | 208d935e8f22b03178648dec4bc579a3468232f9 (diff) |
merge
Diffstat (limited to 'indra/newview/llwearable.cpp')
-rw-r--r-- | indra/newview/llwearable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp index 6c27aefebb..10b9a18fa8 100644 --- a/indra/newview/llwearable.cpp +++ b/indra/newview/llwearable.cpp @@ -442,7 +442,7 @@ BOOL LLWearable::importFile( LLFILE* file ) delete mSavedTEMap[te]; } - image->setLoadedCallback(LLVOAvatarSelf::onTimingLocalTexLoaded,0,TRUE,FALSE, new LLVOAvatarSelf::LLAvatarTexData(id, (LLVOAvatarDefines::ETextureIndex)te)); + image->setLoadedCallback(LLVOAvatarSelf::debugOnTimingLocalTexLoaded,0,TRUE,FALSE, new LLVOAvatarSelf::LLAvatarTexData(id, (LLVOAvatarDefines::ETextureIndex)te)); LLUUID textureid(text_buffer); |