diff options
author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2013-01-30 15:25:09 -0800 |
---|---|---|
committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2013-01-30 15:25:09 -0800 |
commit | ee87ef23037f5e2904dfea3da061a9548cc113f5 (patch) | |
tree | d3aaa5405c97866529e2029572d81ebbd90b8d4a /indra/llimage/tests | |
parent | 07b557cef909d74cd514b2d7e6b666edbfae3ef2 (diff) | |
parent | 60d1404b212824939b8bcd17fd2cc1e46e9bac55 (diff) |
merge downstream code from viewer-lion
Diffstat (limited to 'indra/llimage/tests')
-rw-r--r-- | indra/llimage/tests/llimageworker_test.cpp | 3 |
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() {} |