summaryrefslogtreecommitdiff
path: root/indra/llrender/llimagegl.h
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-04-13 16:39:12 -0400
committerLoren Shih <seraph@lindenlab.com>2010-04-13 16:39:12 -0400
commit85f54aca0f9c93b60e89e79b70bdb1d88b3bc5d6 (patch)
treee605c21a938a5ba794df6e43607de8c4a0d81008 /indra/llrender/llimagegl.h
parent88782e75462ac3a959a59be97ff50b5fc34aabb9 (diff)
parentd05353fc3997f29bcf55a2fa49936e690b0725de (diff)
automated merge
Diffstat (limited to 'indra/llrender/llimagegl.h')
-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 f0870c3fc4..41239d24c8 100644
--- a/indra/llrender/llimagegl.h
+++ b/indra/llrender/llimagegl.h
@@ -157,7 +157,7 @@ public:
void updatePickMask(S32 width, S32 height, const U8* data_in);
BOOL getMask(const LLVector2 &tc);
- void checkTexSize() const ;
+ void checkTexSize(bool forced = false) const ;
// Sets the addressing mode used to sample the texture
// (such as wrapping, mirrored wrapping, and clamp)