diff options
author | Merov Linden <merov@lindenlab.com> | 2010-09-16 20:09:36 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-09-16 20:09:36 -0700 |
commit | 8ada6ed3cf562d33cc66f2a5d664b5e1f40e1f0c (patch) | |
tree | a6430d873ca02f5cee683c95a3a4747c16f8aace /indra/newview/llexpandabletextbox.cpp | |
parent | 657f75b89de4cfd5ade82e3bc30e236cd2533017 (diff) | |
parent | 30c8979e157a4503509360f0c70d609eb97d6db9 (diff) |
Pull update from viewer-development
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()) |