diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2010-02-23 21:51:25 -0800 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2010-02-23 21:51:25 -0800 |
| commit | 2f785135bc39575ec306b2b057e446e61c5369d7 (patch) | |
| tree | 8c2e6a03962b24700694c6887dacd1558df7cde9 /indra/llui/llui.cpp | |
| parent | 31e4b6e79ccd0a0451de3fa6a487f775d9f45497 (diff) | |
| parent | b214180ac189f6c6347347c5d3a5dc7035e0c039 (diff) | |
Merge with viewer 2.
Diffstat (limited to 'indra/llui/llui.cpp')
| -rw-r--r-- | indra/llui/llui.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index bf5d53ac29..b348ec2d29 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -710,19 +710,19 @@ void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degre v = LLVector3(offset_x, offset_y, 0.f) * quat; gGL.texCoord2f(uv_rect.mRight, uv_rect.mTop); - gGL.vertex2f((GLint)v.mV[0], (GLint)v.mV[1] ); + gGL.vertex2f(v.mV[0], v.mV[1] ); v = LLVector3(-offset_x, offset_y, 0.f) * quat; gGL.texCoord2f(uv_rect.mLeft, uv_rect.mTop); - gGL.vertex2f((GLint)v.mV[0], (GLint)v.mV[1] ); + gGL.vertex2f(v.mV[0], v.mV[1] ); v = LLVector3(-offset_x, -offset_y, 0.f) * quat; gGL.texCoord2f(uv_rect.mLeft, uv_rect.mBottom); - gGL.vertex2f((GLint)v.mV[0], (GLint)v.mV[1] ); + gGL.vertex2f(v.mV[0], v.mV[1] ); v = LLVector3(offset_x, -offset_y, 0.f) * quat; gGL.texCoord2f(uv_rect.mRight, uv_rect.mBottom); - gGL.vertex2f((GLint)v.mV[0], (GLint)v.mV[1] ); + gGL.vertex2f(v.mV[0], v.mV[1] ); } gGL.end(); gGL.popUIMatrix(); @@ -1977,6 +1977,7 @@ namespace LLInitParam { setBlockFromValue(); addSynonym(name, ""); + setBlockFromValue(); } void TypedParam<const LLFontGL*>::setValueFromBlock() const |