summaryrefslogtreecommitdiff
path: root/indra/newview/llmaniptranslate.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-06-15 22:15:41 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-06-15 22:17:19 +0300
commitf41839e2b905fb680ef1c4cb253f5942c444bfa6 (patch)
tree9bf1546bcbda54196fe225d7c821cf10e16ff5b0 /indra/newview/llmaniptranslate.cpp
parent5b92d266df00c8d8b8a6353061b4a9672bfa97f5 (diff)
SL-15403 Crash at LLFloaterTools's setStatusText
On shutdown some floaters reset tools using LLToolMgr::setCurrentToolset and it updates LLFloaterTools, which might be dead by that point
Diffstat (limited to 'indra/newview/llmaniptranslate.cpp')
-rw-r--r--indra/newview/llmaniptranslate.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp
index 9248c160c6..8736d3b51f 100644
--- a/indra/newview/llmaniptranslate.cpp
+++ b/indra/newview/llmaniptranslate.cpp
@@ -287,7 +287,10 @@ LLManipTranslate::~LLManipTranslate()
void LLManipTranslate::handleSelect()
{
LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
- gFloaterTools->setStatusText("move");
+ if (gFloaterTools)
+ {
+ gFloaterTools->setStatusText("move");
+ }
LLManip::handleSelect();
}