summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2017-06-08 17:17:59 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2017-06-08 17:17:59 +0300
commit66bcb3bb8b2837a2a7638817a887ca772a4ba735 (patch)
treedbf4f01366b7f2927865d1dda605ff18ad8c4068
parentc1acdb8b261e60999b820ea36171c18d4c298155 (diff)
MAINT-7460 FIXED Crash in LLPopupView::removePopup()
-rw-r--r--indra/newview/llexpandabletextbox.cpp3
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)