diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 17:50:32 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 17:50:32 -0800 |
| commit | 8c44fac93ffce1a41d84f1d6e98891a50ab1dbab (patch) | |
| tree | aca14bb3256b6dd4c1a7a342d36f2cc989159f41 /indra/newview/llexpandabletextbox.cpp | |
| parent | 1712265901da8ba65f2a9ae3e903372fafacd268 (diff) | |
| parent | e654475529d924603a9b3bc8c4775c86d3cf7933 (diff) | |
merge from remote repo
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 { |