diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-18 16:51:23 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-18 16:51:23 -0700 |
| commit | 4db36dfcdca29eefee618cbfe318e9d6fea16c7b (patch) | |
| tree | e2921ff30e2b294ac4d726a083c0225902494ecc /indra/llimage/llimage.h | |
| parent | 52e306d575b38cb80fcda38efa83be32c251766b (diff) | |
| parent | 7021e4b21b3f2ec7007f34f94bc9825949722d5b (diff) | |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/llimage/llimage.h')
| -rw-r--r-- | indra/llimage/llimage.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimage.h b/indra/llimage/llimage.h index 99023351c2..5f54585005 100644 --- a/indra/llimage/llimage.h +++ b/indra/llimage/llimage.h @@ -148,7 +148,7 @@ public: protected: // special accessor to allow direct setting of mData and mDataSize by LLImageFormatted - void setDataAndSize(U8 *data, S32 size) { mData = data; mDataSize = size; } + void setDataAndSize(U8 *data, S32 size); public: static void generateMip(const U8 *indata, U8* mipdata, int width, int height, S32 nchannels); |