diff options
author | Tank_Master <tank.master@phoenixviewer.com> | 2014-01-18 10:56:00 -0800 |
---|---|---|
committer | Tank_Master <tank.master@phoenixviewer.com> | 2014-01-18 10:56:00 -0800 |
commit | 091185b057d312e05f6b7ec7d03a37dec0879adf (patch) | |
tree | 48d4d4b4d3c1b02e40f9b029cf65bb200687f087 /indra/llkdu/tests | |
parent | a0ac409e8a4a822a55e9079b4a6d947af5edf220 (diff) | |
parent | d8a81b240e828a8ab27709fb11038a4b5c4d5428 (diff) |
Merge
Diffstat (limited to 'indra/llkdu/tests')
-rwxr-xr-x | 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 b675153b2e..62c245f125 100755 --- a/indra/llkdu/tests/llimagej2ckdu_test.cpp +++ b/indra/llkdu/tests/llimagej2ckdu_test.cpp @@ -58,8 +58,7 @@ mWidth(0), mHeight(0), mComponents(0), mBadBufferAllocation(false), -mAllowOverSize(false), -mMemType(LLMemType::MTYPE_IMAGEBASE) +mAllowOverSize(false) { } LLImageBase::~LLImageBase() { } U8* LLImageBase::allocateData(S32 ) { return NULL; } |