summaryrefslogtreecommitdiff
path: root/indra/llimage/tests/llimageworker_test.cpp
diff options
context:
space:
mode:
authorGeenz <geenz@geenzo.com>2013-02-15 11:52:18 -0500
committerGeenz <geenz@geenzo.com>2013-02-15 11:52:18 -0500
commitec3b4e05a43fec4414924eb92a483bc164fb0ec2 (patch)
tree01c2626f55bef0db287eeca17d00b77e3391cbfb /indra/llimage/tests/llimageworker_test.cpp
parentc2785a740eb98d28ba705c981f4b6b289501d2e5 (diff)
parentb7cd89da5f74663a9fd547af77afaed06cdb05fd (diff)
Merge with latest viewer-dev-materials.
Diffstat (limited to 'indra/llimage/tests/llimageworker_test.cpp')
-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() {}