diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-25 15:07:39 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-25 15:07:39 -0700 |
| commit | a70d9363dadd23f5304013f87d47e5251d62c575 (patch) | |
| tree | 774508d959bf46265f1d34dae2ab915c695c16bf /indra/newview/llwearable.cpp | |
| parent | b26d3f37bef4e10be2b5f7f4f6408485ed3ccae7 (diff) | |
| parent | 687b4907216339b5ff2b79a5a6c5dfdfb6deeba2 (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); |