diff options
| author | simon <none@none> | 2014-04-01 18:45:13 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-04-01 18:45:13 -0700 |
| commit | 4026a6a4d67d6e079e92b0973942a1f896ae496e (patch) | |
| tree | f6edea5301905efca420cd5994efdb71c33819e5 /indra/llimage/tests | |
| parent | e96fad30ac06f040099db2148a0f482641d1cbd4 (diff) | |
| parent | 565c41fdc2e2f8f9841cb41b446671563ea8d5e1 (diff) | |
Merge downstream code
Diffstat (limited to 'indra/llimage/tests')
| -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() { } |