diff options
| author | callum_linden <none@none> | 2015-05-18 12:00:36 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-05-18 12:00:36 -0700 |
| commit | 80aa29eaec78d267b4fa1822cfbd3a33b268066a (patch) | |
| tree | 1ce0483bd490750e367bfe53a19ec312cdc0bd27 /indra/llimage/tests | |
| parent | d214c2854110520d5574f675bcc12f64bfd42090 (diff) | |
| parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) | |
Merge with Viewer Release (after Viewer Release updated with Viewer Tools Update)
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 // ------------------------------------------------------------------------------------------- |