summaryrefslogtreecommitdiff
path: root/indra/llkdu
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-01-24 16:36:31 -0500
committerGeenz <geenz@geenzo.com>2013-01-24 16:36:31 -0500
commitf39532c407229403f6d67312638bf5dc3514687d (patch)
treede0f376b3bbe03d585f989adf02c3eadb01347f2 /indra/llkdu
parenta82ff3fcb7556bd810ec37c0b74c565b42e92250 (diff)
parenta30a2c492d06c9ef843a43c0ff0be6f2826d6d0b (diff)
Merged with latest viewer-dev.
Diffstat (limited to 'indra/llkdu')
-rw-r--r--[-rwxr-xr-x]indra/llkdu/tests/llimagej2ckdu_test.cpp3
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..100644
--- 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; }