diff options
| author | richard <none@none> | 2009-10-28 15:21:44 -0700 |
|---|---|---|
| committer | richard <none@none> | 2009-10-28 15:21:44 -0700 |
| commit | 480a1db3546efbf2a40a473d33b689ee5b2e4eb5 (patch) | |
| tree | 6d40011b258571069841ca4f500b1096849ebedf /indra | |
| parent | 74e70f2f23901d524350252519beaef8ed6d42e5 (diff) | |
| parent | da58b592177cc1960e611831038cb9c39eaee4c0 (diff) | |
merge
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 13 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_group_roles.xml | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 653505a12e..2b1d677ffb 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -419,9 +419,6 @@ 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(); @@ -2381,7 +2378,6 @@ S32 LLNormalTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 lin { if (text[last_char] == '\n') { - last_char++; break; } } @@ -2401,9 +2397,14 @@ S32 LLNormalTextSegment::getNumChars(S32 num_pixels, S32 segment_offset, S32 lin // If at the beginning of a line, and a single character won't fit, draw it anyway num_chars = 1; } - if (mStart + segment_offset + num_chars == mEditor.getLength()) + + // include *either* the EOF or newline character in this run of text + // but not both + S32 last_char_in_run = mStart + segment_offset + num_chars; + // check length first to avoid indexing off end of string + if (last_char_in_run >= mEditor.getLength() + || text[last_char_in_run] == '\n') { - // include terminating NULL num_chars++; } return num_chars; diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml index 75ded4f249..af1919bd8f 100644 --- a/indra/newview/skins/default/xui/en/panel_group_roles.xml +++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml @@ -486,7 +486,7 @@ things in this group. There's a broad variety of Abilities. </panel> </tab_container> <panel - height="170" + height="190" layout="topleft" follows="left|top" left="10" @@ -556,7 +556,7 @@ things in this group. There's a broad variety of Abilities. </scroll_list> </panel> <panel - height="215" + height="252" layout="topleft" left_delta="0" name="roles_footer" |