diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-09-22 09:18:34 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-09-22 09:18:34 -0700 |
| commit | 5d3599f5d155dc112c8f05197c8fc73397084e71 (patch) | |
| tree | 1b67cdb5944a222c1de6de3b974caea78a019762 /indra/newview/llexpandabletextbox.cpp | |
| parent | 150fba7c5cd24ad9ab343e762bfd15032e6a9462 (diff) | |
| parent | 38d9454cbf30f470a723d912be2080f63ae3fa47 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llexpandabletextbox.cpp')
| -rw-r--r-- | indra/newview/llexpandabletextbox.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp index 711a87dc99..d657f04457 100644 --- a/indra/newview/llexpandabletextbox.cpp +++ b/indra/newview/llexpandabletextbox.cpp @@ -407,6 +407,7 @@ void LLExpandableTextBox::collapseTextBox() setRect(mCollapsedRect); updateTextBoxRect(); + gViewerWindow->removePopup(this); } void LLExpandableTextBox::onFocusLost() @@ -434,8 +435,6 @@ void LLExpandableTextBox::reshape(S32 width, S32 height, BOOL called_from_parent mExpanded = false; LLUICtrl::reshape(width, height, called_from_parent); updateTextBoxRect(); - - gViewerWindow->removePopup(this); } void LLExpandableTextBox::setValue(const LLSD& value) |