summaryrefslogtreecommitdiff
path: root/indra/llimage/tests
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-11-20 17:03:55 -0600
committerDave Parks <davep@lindenlab.com>2012-11-20 17:03:55 -0600
commit5d34ac552f3939626840b703b2da380663f25f49 (patch)
treeddeacd3365fed0ad193c053d39ebeb39451cc74a /indra/llimage/tests
parenta830812172d7eb163c06ead3155dc4b43ded4346 (diff)
parent8db983fb8095f25873b8317fd1f4764abce4a31b (diff)
Automated merge with https://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/llimage/tests')
-rw-r--r--indra/llimage/tests/llimageworker_test.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llimage/tests/llimageworker_test.cpp b/indra/llimage/tests/llimageworker_test.cpp
index 08476fb72c..e255d65b43 100644
--- a/indra/llimage/tests/llimageworker_test.cpp
+++ b/indra/llimage/tests/llimageworker_test.cpp
@@ -49,8 +49,7 @@ mWidth(0),
mHeight(0),
mComponents(0),
mBadBufferAllocation(false),
-mAllowOverSize(false),
-mMemType(LLMemType::MTYPE_IMAGEBASE)
+mAllowOverSize(false)
{
}
LLImageBase::~LLImageBase() {}