diff options
| author | simon <none@none> | 2014-04-01 18:42:15 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-04-01 18:42:15 -0700 |
| commit | 565c41fdc2e2f8f9841cb41b446671563ea8d5e1 (patch) | |
| tree | e2ad558f86e8eee0ef69b3bfff6fed0c02c8887e /indra/llimage/tests/llimageworker_test.cpp | |
| parent | 33dfc0a8a1ed56d7d24611981736fd5baf6b03c2 (diff) | |
| parent | 93f7ac98b640c3bff13a87992f928122ee69201c (diff) | |
Merge downstream code
Diffstat (limited to 'indra/llimage/tests/llimageworker_test.cpp')
| -rwxr-xr-x | indra/llimage/tests/llimageworker_test.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llimage/tests/llimageworker_test.cpp b/indra/llimage/tests/llimageworker_test.cpp index e255d65b43..f6fb8f54b4 100755 --- a/indra/llimage/tests/llimageworker_test.cpp +++ b/indra/llimage/tests/llimageworker_test.cpp @@ -58,6 +58,7 @@ void LLImageBase::sanityCheck() { } void LLImageBase::deleteData() { } U8* LLImageBase::allocateData(S32 size) { return NULL; } U8* LLImageBase::reallocateData(S32 size) { return NULL; } +U8* LLImageBase::getData() { return NULL; } LLImageRaw::LLImageRaw(U16 width, U16 height, S8 components) { } LLImageRaw::~LLImageRaw() { } |