diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-05-25 14:33:30 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-05-25 14:33:30 -0700 |
| commit | 208d935e8f22b03178648dec4bc579a3468232f9 (patch) | |
| tree | 27f68d7fc161ae87287c3f113bbcd6f68cef6c14 /indra/newview/llwearable.cpp | |
| parent | 16d337307ea618cc2a72b4611c3404b8c15f7f54 (diff) | |
| parent | 1b56e796241f0efbcbe6a3f95d373220b6b54fad (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); |