diff options
author | Richard Linden <none@none> | 2014-03-24 19:23:34 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2014-03-24 19:23:34 -0700 |
commit | e5bbdafdeda0f2e6bbe97d59a24ca398b54c31eb (patch) | |
tree | 359719c76abf090fb8cc5ae912ed013b64cb8fc7 /indra/llkdu/tests | |
parent | 31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff) | |
parent | 5b846ed2a6dce6c5801aa74d0f36a1c7525fbcba (diff) |
merge with release
Diffstat (limited to 'indra/llkdu/tests')
-rwxr-xr-x | indra/llkdu/tests/llimagej2ckdu_test.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp index 62c245f125..3f627b65e1 100755 --- a/indra/llkdu/tests/llimagej2ckdu_test.cpp +++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp @@ -43,7 +43,9 @@ // End Stubbing // ------------------------------------------------------------------------------------------- -// Stubb the LL Image Classes +// Stub the LL Image Classes +//LLTrace::MemStatHandle LLImageBase::sMemStat("LLImage"); + LLImageRaw::LLImageRaw() { } LLImageRaw::~LLImageRaw() { } U8* LLImageRaw::allocateData(S32 ) { return NULL; } @@ -52,7 +54,8 @@ U8* LLImageRaw::reallocateData(S32 ) { return NULL; } BOOL LLImageRaw::resize(U16, U16, S8) { return TRUE; } // this method always returns TRUE... LLImageBase::LLImageBase() -: mData(NULL), +: LLTrace::MemTrackable<LLImageBase>("LLImageBase"), +mData(NULL), mDataSize(0), mWidth(0), mHeight(0), |