summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexteditor.cpp
diff options
context:
space:
mode:
authorpavelkproductengine <pavelkproductengine@lindenlab.com>2016-03-21 18:36:50 +0200
committerpavelkproductengine <pavelkproductengine@lindenlab.com>2016-03-21 18:36:50 +0200
commit5bbf263c293286395730d969e0b9beec9d830f48 (patch)
tree22b81dea68f728ec122de561cb8d77fe4fb14d94 /indra/newview/llviewertexteditor.cpp
parent824deea265614b649e074d4702e8f4bf071cef68 (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())