diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-03-26 10:16:41 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-03-26 10:16:41 -0400 |
commit | b74e1d942352e81e0cc00e21ef3b351152b32248 (patch) | |
tree | 838812f6da2304db1313c765579736ff259cd593 /indra/llrender/llimagegl.cpp | |
parent | 0a56031bd3e3645a9e5124a722cece0706469944 (diff) | |
parent | a4741cdd1084ce5e3d4940cc4b33556e82e0ce6b (diff) |
automated merge
Diffstat (limited to 'indra/llrender/llimagegl.cpp')
-rw-r--r-- | indra/llrender/llimagegl.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 5edd6c8886..3d8bd21609 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1743,8 +1743,6 @@ BOOL LLImageGL::getMask(const LLVector2 &tc) llassert(false); } - llassert(mPickMaskWidth >= 0 && mPickMaskHeight >= 0); - S32 x = llfloor(u * mPickMaskWidth); S32 y = llfloor(v * mPickMaskHeight); |