diff options
author | richard <none@none> | 2009-11-05 11:04:06 -0800 |
---|---|---|
committer | richard <none@none> | 2009-11-05 11:04:06 -0800 |
commit | d3d5965d8af250f76e143addcfb68b17390f483c (patch) | |
tree | 0f209c21c10fe775e582ce8a940a074af16dc458 /indra/newview/llexpandabletextbox.cpp | |
parent | 535a98ce163e37b3bc495489923413701ea67995 (diff) | |
parent | bbbacf1c4d06e7a0b4a5f532565410496a72963a (diff) |
merge
Diffstat (limited to 'indra/newview/llexpandabletextbox.cpp')
-rw-r--r-- | indra/newview/llexpandabletextbox.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp index 7bc48185e6..424d635321 100644 --- a/indra/newview/llexpandabletextbox.cpp +++ b/indra/newview/llexpandabletextbox.cpp @@ -48,11 +48,12 @@ public: mExpanderLabel(more_text) {} - /*virtual*/ void getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const + /*virtual*/ bool getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const { // more label always spans width of text box width = mEditor.getTextRect().getWidth() - mEditor.getHPad(); height = llceil(mStyle->getFont()->getLineHeight()); + return true; } /*virtual*/ S32 getOffset(S32 segment_local_x_coord, S32 start_offset, S32 num_chars, bool round) const { |