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

SL-14366 Close empty script actions floater

master
Mnikolenko Productengine 2020-11-24 16:21:05 +02:00
parent 04c473ab46
commit 1a7ca0ac71
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llviewermenu.cpp
View File

@ -7206,7 +7206,7 @@ namespace
};
}
void queue_actions(LLFloaterScriptQueue* q, const std::string& msg)
bool queue_actions(LLFloaterScriptQueue* q, const std::string& msg)
{
QueueObjects func(q);
LLSelectMgr *mgr = LLSelectMgr::getInstance();
@ -7228,6 +7228,7 @@ void queue_actions(LLFloaterScriptQueue* q, const std::string& msg)
{
LL_ERRS() << "Bad logic." << LL_ENDL;
}
q->closeFloater();
}
else
{
@ -7236,6 +7237,7 @@ void queue_actions(LLFloaterScriptQueue* q, const std::string& msg)
LL_WARNS() << "Unexpected script compile failure." << LL_ENDL;
}
}
return !fail;
}
class LLToolsSelectedScriptAction : public view_listener_t
@ -7283,8 +7285,10 @@ class LLToolsSelectedScriptAction : public view_listener_t
if (queue)
{
queue->setMono(mono);
queue_actions(queue, msg);
queue->setTitle(title);
if (queue_actions(queue, msg))
{
queue->setTitle(title);
}
}
else
{