summaryrefslogtreecommitdiff
path: root/indra/llimage/tests
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-01-08 09:45:27 -0500
committerOz Linden <oz@lindenlab.com>2013-01-08 09:45:27 -0500
commita7dbaaa0af643fc5bce0b740a92e69dfb931c6e8 (patch)
tree3eddbd3f421f430c9b03487261e89c95017657b9 /indra/llimage/tests
parent0d12d171cf20c63a45e7ad0989e65d05aabb86ea (diff)
parent77abdd04a4a390049c2143e1d87542b9b2a06c86 (diff)
merge changes for DRTVWR-250
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() {}