livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
Andrey Kleshchev 2021-06-15 22:15:41 +03:00
parent 5b92d266df
commit f41839e2b9
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llmaniprotate.cpp
View File

@ -105,7 +105,10 @@ void LLManipRotate::handleSelect()
{
// *FIX: put this in mouseDown?
LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
gFloaterTools->setStatusText("rotate");
if (gFloaterTools)
{
gFloaterTools->setStatusText("rotate");
}
LLManip::handleSelect();
}

5
indra/newview/llmanipscale.cpp
View File

@ -170,7 +170,10 @@ void LLManipScale::handleSelect()
LLBBox bbox = LLSelectMgr::getInstance()->getBBoxOfSelection();
updateSnapGuides(bbox);
LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
gFloaterTools->setStatusText("scale");
if (gFloaterTools)
{
gFloaterTools->setStatusText("scale");
}
LLManip::handleSelect();
}

5
indra/newview/llmaniptranslate.cpp
View File

@ -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();
}