summaryrefslogtreecommitdiff
path: root/indra/llrender/llimagegl.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-10-16 21:02:48 -0400
committerNat Goodspeed <nat@lindenlab.com>2012-10-16 21:02:48 -0400
commitc370313676451f6e5cfd72bec314ad79bc653833 (patch)
tree1bd99330b482d828f8edc71691d177078123fd1e /indra/llrender/llimagegl.h
parent988767d5ec4631ad9f0099180a92c4f186553940 (diff)
parentf2e2ea99a351ca8663af460974137545d020b97f (diff)
Automated merge with file:///Users/nat/linden/viewer-sourceid
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; }