diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-09-16 12:02:24 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-09-16 12:02:24 -0700 |
| commit | 60db8577a90be3ea3d4a06ab06232802be953286 (patch) | |
| tree | 0fcedbdf478b3f518a0d5dc69b7d234406355d75 /indra/newview/llexpandabletextbox.cpp | |
| parent | ae623c8068145f968f09ccf9bbdd90e993ca4283 (diff) | |
| parent | 1dbcc3fff79b55038178e493df0cc0c3a4d66221 (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()) |