diff options
author | Oz Linden <oz@lindenlab.com> | 2013-01-17 13:54:39 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-01-17 13:54:39 -0500 |
commit | 841dc5da2ef9626fa4ab9255681d217df62a6b0b (patch) | |
tree | 2c5bacebcb27b78d318b6e162334488f6e515974 /indra/llrender/llimagegl.h | |
parent | b7f8a2479249646c7fb38ead195d5197ab733c94 (diff) | |
parent | d16757545c91d4f7dac3c52a311ad0f0239052e1 (diff) |
merge up to 3.4.4
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; } |