diff options
| author | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-04-15 00:23:36 +0200 |
|---|---|---|
| committer | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-04-15 00:23:36 +0200 |
| commit | 49630f6bf56db8b2561d99cd71cfcf2b7bee9f90 (patch) | |
| tree | 2b44d1dde9392cf2e5eaa9cb60d2033f0d9bc355 /indra/llimage/tests | |
| parent | 079ad3b5767c444a29f97ca2e6b27fdb28f4b116 (diff) | |
| parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) | |
Merge
Diffstat (limited to 'indra/llimage/tests')
| -rwxr-xr-x | indra/llimage/tests/llimageworker_test.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llimage/tests/llimageworker_test.cpp b/indra/llimage/tests/llimageworker_test.cpp index c030b105fb..51c5c63556 100755 --- a/indra/llimage/tests/llimageworker_test.cpp +++ b/indra/llimage/tests/llimageworker_test.cpp @@ -67,6 +67,8 @@ LLImageRaw::~LLImageRaw() { } void LLImageRaw::deleteData() { } U8* LLImageRaw::allocateData(S32 size) { return NULL; } U8* LLImageRaw::reallocateData(S32 size) { return NULL; } +const U8* LLImageBase::getData() const { return NULL; } +U8* LLImageBase::getData() { return NULL; } // End Stubbing // ------------------------------------------------------------------------------------------- |