summaryrefslogtreecommitdiff
path: root/indra/llimage/tests
diff options
context:
space:
mode:
authornat_linden <nat@lindenlab.com>2015-04-15 10:50:46 -0400
committernat_linden <nat@lindenlab.com>2015-04-15 10:50:46 -0400
commit75396e1f131137d7f0dfb3f5fdbddeea1ce12fba (patch)
tree33ca8281a889107816663e2bacfc44cfeeb9e815 /indra/llimage/tests
parente59dbf1b23a13c6a7f1f0d9661d3dcb78ea040f2 (diff)
parente611e35e033e99f619b0e4938f6879c8e387efd5 (diff)
Merged lindenlab/viewer-tools-update into default
Diffstat (limited to 'indra/llimage/tests')
-rwxr-xr-xindra/llimage/tests/llimageworker_test.cpp2
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
// -------------------------------------------------------------------------------------------