diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2012-10-25 16:13:39 -0700 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2012-10-25 16:13:39 -0700 |
| commit | 0cdff2817bdc342e0ac8b3c8711e3f7a72f1f617 (patch) | |
| tree | 0fbaca9292450f05588336eb6639b12d182156e1 /indra/llimage/llimage.h | |
| parent | 03fa24f8aecc071bac920a400c122cbce0b029b4 (diff) | |
| parent | 1743e6a81330824021667000f8acdd6cf64dbf1b (diff) | |
Merge
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); |