diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-04-09 23:49:11 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-04-09 23:49:11 -0600 |
| commit | 0a80627bca63ee05ce07df510ebe2072399dd01d (patch) | |
| tree | 8af963a46af857daabc0a24f3aefe36ee141a09e /indra/llrender/llimagegl.h | |
| parent | 55ea80076bafcd1baf6a8ccf713267b8c2c24185 (diff) | |
| parent | d64ccab573e9455815dede58f8027a8f2337a728 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
Diffstat (limited to 'indra/llrender/llimagegl.h')
| -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 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) |