diff options
author | Rider Linden <rider@lindenlab.com> | 2015-04-14 09:34:49 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2015-04-14 09:34:49 -0700 |
commit | 82ae214f6a367e17dd335e80e2444cf672108821 (patch) | |
tree | 5a2ebb115b0674698cfb0d9cbd879add63d88ece /indra/llimage/tests | |
parent | fe8dec32dbdd6085dd582c49134551638561ca0e (diff) | |
parent | a49e11efd9e249cc6d3cf5bcffaafe1e831f2fa9 (diff) |
Merged lindenlab/viewer-tools-update into default
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 // ------------------------------------------------------------------------------------------- |