summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbase.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-10-13 16:25:48 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-10-13 16:25:48 +0000
commit20e56a6925b4d4106059a73a22170beb5a38be1e (patch)
tree6b9d6dec9f628dfa1ab948cbfb10b86fe4cdc826 /indra/llui/lltextbase.cpp
parent330e635c2ce2ea0650226f56559cf1068df0320d (diff)
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1992 https://svn.aws.productengine.com/secondlife/pe/stable-2@2004 -> viewer-2.0.0-3
* Bugs: EXT-1091 EXT-1418 EXT-996 EXT-1150 EXT-1188 EXT-1417 EXT-1181 EXT-1058 EXT-1397 EXT-836 EXT-1437 EXT-1379 * Dev: EXT-1291 EXT-1255 EXT-992 EXT-96 EXT-1157
Diffstat (limited to 'indra/llui/lltextbase.cpp')
-rw-r--r--indra/llui/lltextbase.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 123e59ae6a..e85bee7775 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -415,6 +415,9 @@ void LLTextBase::drawCursor()
return;
}
+ if (!mTextRect.contains(cursor_rect))
+ return;
+
// Draw the cursor
// (Flash the cursor every half second starting a fixed time after the last keystroke)
F32 elapsed = mCursorBlinkTimer.getElapsedTimeF32();