summaryrefslogtreecommitdiff
path: root/indra/llrender/llimagegl.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-07 08:40:59 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-07 08:40:59 +0100
commitc3cdb8ced6ad9cedf9a4b37d19d302c59d33d72c (patch)
treef0c5484493ffc1319439f31b1df77bf9d818bdbb /indra/llrender/llimagegl.h
parentb89c31052802450ec59fee48ace4c66a713755ab (diff)
parentaad87303c88458c9db3c312d44e8a4b125de1fe3 (diff)
merge from viewer-trunk
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 41239d24c8..03939888a5 100644
--- a/indra/llrender/llimagegl.h
+++ b/indra/llrender/llimagegl.h
@@ -91,7 +91,7 @@ public:
protected:
virtual ~LLImageGL();
- void analyzeAlpha(const void* data_in, S32 w, S32 h);
+ void analyzeAlpha(const void* data_in, U32 w, U32 h);
void calcAlphaChannelOffsetAndStride();
public: