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

MAINT-6448 PERMISSION_DEBIT notification should default to Deny

master
andreykproductengine 2016-06-02 19:59:35 +03:00
parent e2ee3a1519
commit 33be227716
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/lltoastscriptquestion.cpp
View File

@ -54,6 +54,19 @@ BOOL LLToastScriptQuestion::postBuild()
return TRUE;
}
// virtual
void LLToastScriptQuestion::setFocus(BOOL b)
{
LLToastPanel::setFocus(b);
// toast can fade out and disappear with focus ON, so reset to default anyway
LLButton* dfbutton = getDefaultButton();
if (dfbutton && dfbutton->getVisible() && dfbutton->getEnabled())
{
dfbutton->setFocus(b);
}
}
void LLToastScriptQuestion::snapToMessageHeight()
{
LLTextBox* mMessage = getChild<LLTextBox>("top_info_message");
@ -118,6 +131,12 @@ void LLToastScriptQuestion::createButtons()
button->setRect(rect);
buttons_width += rect.getWidth() + LEFT_PAD;
if (form_element.has("default") && form_element["default"].asBoolean())
{
button->setFocus(TRUE);
setDefaultBtn(button);
}
}
}
}

2
indra/newview/lltoastscriptquestion.h
View File

@ -39,6 +39,8 @@ public:
virtual BOOL postBuild();
virtual ~LLToastScriptQuestion(){};
/*virtual*/ void setFocus(BOOL b);
private:
void snapToMessageHeight();