diff options
author | Richard Linden <none@none> | 2010-05-25 14:52:25 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-05-25 14:52:25 -0700 |
commit | 687b4907216339b5ff2b79a5a6c5dfdfb6deeba2 (patch) | |
tree | 82a1ae09c92bf4924438b31585ee16472b85fa12 /indra/newview/llwearable.cpp | |
parent | b2274765dade87417f5b526c8b72f353ba6f4898 (diff) | |
parent | b0bdde3ee307e144d9047521fce84c318b0fc789 (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); |