diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-19 16:23:42 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-19 16:23:42 +0300 |
| commit | 4e62d8cc9cf7ea391ab08c6fa6eecb375eb249b0 (patch) | |
| tree | 205da4dc5c4c4b10fe6d7f6c80d77641e06df193 /indra/newview/llwearable.cpp | |
| parent | ac9f9d82a08840aac569f853e0d4b24d0e4ad103 (diff) | |
| parent | 116382fdf78ca578a74c30a162208033fd021124 (diff) | |
Merge from default branch. Fixed gcc build.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llwearable.cpp')
| -rw-r--r-- | indra/newview/llwearable.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp index c5042ca016..1209b60679 100644 --- a/indra/newview/llwearable.cpp +++ b/indra/newview/llwearable.cpp @@ -52,6 +52,7 @@ #include "llvoavatarself.h" #include "llvoavatardefines.h" #include "llwearable.h" +#include "llviewercontrol.h" using namespace LLVOAvatarDefines; @@ -444,8 +445,10 @@ BOOL LLWearable::importFile( LLFILE* file ) delete mSavedTEMap[te]; } - image->setLoadedCallback(LLVOAvatarSelf::debugOnTimingLocalTexLoaded,0,TRUE,FALSE, new LLVOAvatarSelf::LLAvatarTexData(id, (LLVOAvatarDefines::ETextureIndex)te), NULL); - + if(gSavedSettings.getBOOL("DebugAvatarLocalTexLoadedTime")) + { + image->setLoadedCallback(LLVOAvatarSelf::debugOnTimingLocalTexLoaded,0,TRUE,FALSE, new LLVOAvatarSelf::LLAvatarTexData(id, (LLVOAvatarDefines::ETextureIndex)te), NULL); + } LLUUID textureid(text_buffer); mTEMap[te] = new LLLocalTextureObject(image, textureid); mSavedTEMap[te] = new LLLocalTextureObject(image, textureid); |