diff options
author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-12 12:58:28 -0800 |
---|---|---|
committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-12 12:58:28 -0800 |
commit | 0e6139eb3d3af1e77df20f87deef427993bf2c61 (patch) | |
tree | 2c93f9a8d69f28cec99393b3cacbab85a8aa073d /indra/llrender/llimagegl.h | |
parent | 6f53b5baeb9e04c20c8fe6f419e09c9604a56497 (diff) | |
parent | 7833ecb58094641d3cd79c6772ad6c9fd4799f92 (diff) |
merging in latest changes
Diffstat (limited to 'indra/llrender/llimagegl.h')
-rwxr-xr-x[-rw-r--r--] | indra/llrender/llimagegl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h index e118c28c1b..cf3c484c79 100644..100755 --- a/indra/llrender/llimagegl.h +++ b/indra/llrender/llimagegl.h @@ -100,7 +100,7 @@ protected: public: virtual void dump(); // debugging info to llinfos - void setSize(S32 width, S32 height, S32 ncomponents); + void setSize(S32 width, S32 height, S32 ncomponents, S32 discard_level = -1); void setComponents(S32 ncomponents) { mComponents = (S8)ncomponents ;} void setAllowCompression(bool allow) { mAllowCompression = allow; } |