summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-13 12:51:21 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-13 12:51:21 +0000
commit0a0554575f1234f836beec72c1073303b90b7190 (patch)
tree5f63bc7cf7769fa774281d85820274aa7f7a8ac9 /indra/llui
parentdaeb21ec2a4a6b952602bf54a518b61ef5b44f17 (diff)
parent420df10263103f64f366e9a0d2b704f83448a180 (diff)
backout merge.
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llui.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index 852a19660a..44a57a0989 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.vertex2i(v.mV[0], v.mV[1] );
+ gGL.vertex2i((GLint)v.mV[0], (GLint)v.mV[1] );
v = LLVector3(-offset_x, offset_y, 0.f) * quat;
gGL.texCoord2f(uv_rect.mLeft, uv_rect.mTop);
- gGL.vertex2i(v.mV[0], v.mV[1] );
+ gGL.vertex2i((GLint)v.mV[0], (GLint)v.mV[1] );
v = LLVector3(-offset_x, -offset_y, 0.f) * quat;
gGL.texCoord2f(uv_rect.mLeft, uv_rect.mBottom);
- gGL.vertex2i(v.mV[0], v.mV[1] );
+ gGL.vertex2i((GLint)v.mV[0], (GLint)v.mV[1] );
v = LLVector3(offset_x, -offset_y, 0.f) * quat;
gGL.texCoord2f(uv_rect.mRight, uv_rect.mBottom);
- gGL.vertex2i(v.mV[0], v.mV[1] );
+ gGL.vertex2i((GLint)v.mV[0], (GLint)v.mV[1] );
}
gGL.end();
gGL.popUIMatrix();