diff options
| author | Nicky <nicky.dasmijn@gmail.com> | 2022-06-13 20:09:42 +0200 |
|---|---|---|
| committer | Nicky <nicky.dasmijn@gmail.com> | 2022-06-13 20:09:42 +0200 |
| commit | 1b73835d6e80bc64c520a8846aebdbe1b7c9705b (patch) | |
| tree | b972275919bf6c620bbbcb81dd6b12568494561e /indra/llkdu | |
| parent | 78e069f5e8ef1ee312e709934482b23aa86a69c2 (diff) | |
| parent | c08a61453b21664da3687661512e2ea208f90d98 (diff) | |
Merge branch 'DRTVWR-543-maint_cmake' of bitbucket.org:NickyD/viewer-cmake into DRTVWR-543-maint_cmake
Diffstat (limited to 'indra/llkdu')
| -rw-r--r-- | indra/llkdu/tests/llimagej2ckdu_test.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llkdu/tests/llimagej2ckdu_test.cpp b/indra/llkdu/tests/llimagej2ckdu_test.cpp index ee7b14be85..16213b7f45 100644 --- a/indra/llkdu/tests/llimagej2ckdu_test.cpp +++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp @@ -63,8 +63,7 @@ U8* LLImageRaw::reallocateData(S32 ) { return NULL; } bool LLImageRaw::resize(U16, U16, S8) { return true; } // this method always returns true... LLImageBase::LLImageBase() -: LLTrace::MemTrackable<LLImageBase>("LLImageBase"), -mData(NULL), +: mData(NULL), mDataSize(0), mWidth(0), mHeight(0), |