Merge pull request #1413 from secondlife/gltf-dev-maint-a-merge

Merge Maint A to development

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/lltoastscriptquestion.cpp b/indra/newview/lltoastscriptquestion.cpp
index 7a3a1d8fd7..49fbf885eb 100644
--- a/indra/newview/lltoastscriptquestion.cpp
+++ b/indra/newview/lltoastscriptquestion.cpp
@@ -37,10 +37,10 @@ LLToastScriptQuestion::LLToastScriptQuestion(const LLNotificationPtr& notificati
 :
 LLToastPanel(notification)
 {
-	buildFromFile("panel_script_question_toast.xml");
+	buildFromFile("panel_script_question_toast.xml", true);
 }
 
-BOOL LLToastScriptQuestion::postBuild()
+bool LLToastScriptQuestion::postBuild()
 {
 	createButtons();
 
@@ -52,11 +52,11 @@ BOOL LLToastScriptQuestion::postBuild()
 
 	snapToMessageHeight();
 
-	return TRUE;
+	return true;
 }
 
 // virtual
-void LLToastScriptQuestion::setFocus(BOOL b)
+void LLToastScriptQuestion::setFocus(bool b)
 {
     LLToastPanel::setFocus(b);
     // toast can fade out and disappear with focus ON, so reset to default anyway
@@ -134,7 +134,7 @@ void LLToastScriptQuestion::createButtons()
 
 			if (form_element.has("default") && form_element["default"].asBoolean())
 			{
-				button->setFocus(TRUE);
+				button->setFocus(true);
 				setDefaultBtn(button);
 			}
 		}