summaryrefslogtreecommitdiff
path: root/indra/llrender/llimagegl.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-08-16 08:52:26 -0400
committerOz Linden <oz@lindenlab.com>2012-08-16 08:52:26 -0400
commita7d8b425097a7fab0a5a40d6a6b5770deb0bb7f9 (patch)
tree81e800d495674faa37d66c18db36cbfccd7fc5eb /indra/llrender/llimagegl.h
parentdf93749819c503a66bc0ad34aeb1c7bed3746df2 (diff)
parentb9e43dfd646990be236e44814ce3199de3391dc1 (diff)
merge up to latest viewer-development
Diffstat (limited to 'indra/llrender/llimagegl.h')
-rwxr-xr-x[-rw-r--r--]indra/llrender/llimagegl.h2
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; }