summaryrefslogtreecommitdiff
path: root/indra/newview/llexpandabletextbox.cpp
diff options
context:
space:
mode:
authorrichard <none@none>2009-11-05 11:55:41 -0800
committerrichard <none@none>2009-11-05 11:55:41 -0800
commit07ea347a0f5049b4052e5a9c31e875d09810f0cd (patch)
tree89356058f4d5ee99802855f9129ea71bc60ca6a5 /indra/newview/llexpandabletextbox.cpp
parentb2bad3f756d1acd78e4d9d38668bdc7653000983 (diff)
parentd3d5965d8af250f76e143addcfb68b17390f483c (diff)
merge
Diffstat (limited to 'indra/newview/llexpandabletextbox.cpp')
-rw-r--r--indra/newview/llexpandabletextbox.cpp3
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
{