summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexteditor.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-03-21 11:00:22 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-03-21 11:00:22 -0400
commit2afde26d93cc8773f5e84d187844f909347fc1bf (patch)
tree5857549829b90f047ae094ebd9b6a9d2817d59aa /indra/newview/llviewertexteditor.cpp
parent132a2587dff85006636d8092ae1b34081f12fe69 (diff)
parent4aae7b51616c0963af4668442bdb5bfaba8c5044 (diff)
merge
Diffstat (limited to 'indra/newview/llviewertexteditor.cpp')
-rwxr-xr-xindra/newview/llviewertexteditor.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 85ae64aeff..09cdfe1309 100755
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -212,12 +212,12 @@ public:
}
}
}
- /*virtual*/ F32 draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRect& draw_rect)
+ /*virtual*/ F32 draw(S32 start, S32 end, S32 selection_start, S32 selection_end, const LLRectf& draw_rect)
{
- LLRect image_rect = draw_rect;
+ LLRectf image_rect = draw_rect;
image_rect.mRight = image_rect.mLeft + mImage->getWidth();
image_rect.mTop = image_rect.mBottom + mImage->getHeight();
- mImage->draw(image_rect);
+ mImage->draw(LLRect(image_rect.mLeft, image_rect.mTop, image_rect.mRight, image_rect.mBottom));
LLColor4 color;
if (mEditor.getReadOnly())