diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 12:11:08 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 12:11:08 -0800 |
| commit | 32f9c1a3b4017843404d263aa4f7da8811e70b49 (patch) | |
| tree | 680d09b635930fe4edcf94cd4a0765f4fc04c147 /indra/newview/llexpandabletextbox.cpp | |
| parent | b60d80542f240c869cf690382cf9cf0278e16e75 (diff) | |
| parent | 07ea347a0f5049b4052e5a9c31e875d09810f0cd (diff) | |
merge with 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 { |