diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-20 09:56:57 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-20 09:56:57 +0100 |
| commit | 301f0c6a3b28a3040f8cb36e73d3b367a9262724 (patch) | |
| tree | 97c37b2db9701f01f9872b58a414990bbc311de4 /indra/newview/llexpandabletextbox.cpp | |
| parent | c2a87df2bccbf6e662f3a4c4edb210748ffa692d (diff) | |
| parent | b92ca367aed209b6e8007035ea307d5a0c8d53dc (diff) | |
merge.
Diffstat (limited to 'indra/newview/llexpandabletextbox.cpp')
| -rw-r--r-- | indra/newview/llexpandabletextbox.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp index f0c2469977..5e10f60aba 100644 --- a/indra/newview/llexpandabletextbox.cpp +++ b/indra/newview/llexpandabletextbox.cpp @@ -121,7 +121,6 @@ LLExpandableTextBox::LLTextBoxEx::LLTextBoxEx(const Params& p) void LLExpandableTextBox::LLTextBoxEx::reshape(S32 width, S32 height, BOOL called_from_parent) { - hideExpandText(); LLTextEditor::reshape(width, height, called_from_parent); if (getTextPixelHeight() > getRect().getHeight()) |