livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accidently used pull and update instead of fetch. No code changed.

meow-7.2.2
Palmer 2009-10-28 15:56:43 -07:00
parent 0be3878182 480a1db354
commit 9cfcb53d19
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/llui/lltextbase.cpp
View File

@ -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;

4
indra/newview/skins/default/xui/en/panel_group_roles.xml
View File

@ -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&apos;s a broad variety of Abilities.
</scroll_list>
</panel>
<panel
height="215"
height="252"
layout="topleft"
left_delta="0"
name="roles_footer"