summaryrefslogtreecommitdiff
path: root/indra/llui/lltextbase.cpp
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2012-02-14 21:57:58 +0100
committerKitty Barnett <develop@catznip.com>2012-02-14 21:57:58 +0100
commitc34b440fec36248ba63a5e85b47caa7271d31bec (patch)
treef4df2f59599dacd69826f1773a34e5bdabcb5864 /indra/llui/lltextbase.cpp
parent60e39343b17f29c65e8a60a415f7ed83ff069a12 (diff)
STORM-276 FIXED Typing in an LLTextEditor freezes the viewer
Diffstat (limited to 'indra/llui/lltextbase.cpp')
-rw-r--r--indra/llui/lltextbase.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 2231d9b983..2d7516a1cd 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -552,7 +552,7 @@ void LLTextBase::drawText()
const LLWString& wstrText = getWText();
mMisspellRanges.clear();
- segment_set_t::iterator seg_it = getSegIterContaining(start);
+ segment_set_t::const_iterator seg_it = getSegIterContaining(start);
while (mSegments.end() != seg_it)
{
LLTextSegmentPtr text_segment = *seg_it;
@@ -673,7 +673,10 @@ void LLTextBase::drawText()
{
// Skip the current word if the user is still busy editing it
if ( (!mSpellCheckTimer.hasExpired()) && (misspell_it->first <= (U32)mCursorPos) && (misspell_it->second >= (U32)mCursorPos) )
+ {
+ ++misspell_it;
continue;
+ }
S32 squiggle_start = 0, squiggle_end = 0, pony = 0;
cur_segment->getDimensions(seg_start - cur_segment->getStart(), misspell_it->first - seg_start, squiggle_start, pony);