diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-12-09 00:00:56 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-12-09 00:00:56 +0200 |
| commit | abbf5ff4b95ba4711f9ba6352650ce5e23f4c1e0 (patch) | |
| tree | 0559aebd49b3df0f2089fc1780ff1477d2d7a720 /indra/llimage | |
| parent | b5f861ae8498a76915e342a7b2d2cd23d565dd37 (diff) | |
| parent | b6dc755786fb06ab109eb36f402a25edaf24ce14 (diff) | |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/llimage')
| -rw-r--r-- | indra/llimage/llimage.cpp | 2 | ||||
| -rw-r--r-- | indra/llimage/llimage.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index 43b6b3bcd6..a07ea14621 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -800,7 +800,7 @@ U8* LLImageBase::getData() return mData; } -bool LLImageBase::isBufferInvalid() +bool LLImageBase::isBufferInvalid() const { return mBadBufferAllocation || mData == NULL ; } diff --git a/indra/llimage/llimage.h b/indra/llimage/llimage.h index 9cc7431a9c..d0bd4a2aef 100644 --- a/indra/llimage/llimage.h +++ b/indra/llimage/llimage.h @@ -141,7 +141,7 @@ public: const U8 *getData() const ; U8 *getData() ; - bool isBufferInvalid() ; + bool isBufferInvalid() const; void setSize(S32 width, S32 height, S32 ncomponents); U8* allocateDataSize(S32 width, S32 height, S32 ncomponents, S32 size = -1); // setSize() + allocateData() |