diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-10-16 09:36:15 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-10-16 09:36:15 -0400 |
| commit | e7a5dc7cda09e65f8592793990c494a978a21271 (patch) | |
| tree | a2cf565398704eb7d75842cc4158b904d3eb06e6 /indra/llimage/llimage.h | |
| parent | 474ea25a5e918f0926706c43f45299383539976c (diff) | |
| parent | a7f6dcaef7fb49901a2ebf0629e3089fa8cdad98 (diff) | |
pull back changes from 3.4.1-beta8
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); |