diff options
author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-05 13:39:53 -0700 |
---|---|---|
committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-05 13:39:53 -0700 |
commit | 81a63ac0886a31a566535a3483e5013f5bc0b424 (patch) | |
tree | 1bb0319755a5e26e0bc7f9f20632ae8f31538971 /indra/newview/llexpandabletextbox.h | |
parent | 0f5bbec3747f3ff2b1d580506d35dc080fcd1a98 (diff) | |
parent | 9818f158366a0df980a2e4b9251177d9a9209cfb (diff) |
merge with latest from lindenlab/svn-imports-viewer-20
Diffstat (limited to 'indra/newview/llexpandabletextbox.h')
-rw-r--r-- | indra/newview/llexpandabletextbox.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/llexpandabletextbox.h b/indra/newview/llexpandabletextbox.h index 0a5a4c8b75..0b9c3f7258 100644 --- a/indra/newview/llexpandabletextbox.h +++ b/indra/newview/llexpandabletextbox.h @@ -64,17 +64,17 @@ protected: */ /*virtual*/ void draw(); - /** - * Draws simple text(no urls) line by line, will show or hide "More" link - * if needed. - */ - /*virtual*/ void drawText( S32 x, S32 y, const LLWString &text, const LLColor4& color ); - - /** - * Draws segmented text(with urls) line by line. Will show or hide "More" link - * if needed - */ - void drawTextSegments(S32 x, S32 y, const LLWString &text); +// /** +// * Draws simple text(no urls) line by line, will show or hide "More" link +// * if needed. +// */ +// /*virtual*/ void drawText( S32 x, S32 y, const LLWString &text, const LLColor4& color ); +// +// /** +// * Draws segmented text(with urls) line by line. Will show or hide "More" link +// * if needed +// */ +// void drawTextSegments(S32 x, S32 y, const LLWString &text); /** * Returns difference between text box height and text height. |