Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/lltoastscriptquestion.cpp b/indra/newview/lltoastscriptquestion.cpp
index fd1e30345c..25dc0982b8 100644
--- a/indra/newview/lltoastscriptquestion.cpp
+++ b/indra/newview/lltoastscriptquestion.cpp
@@ -40,7 +40,7 @@ LLToastPanel(notification)
     buildFromFile("panel_script_question_toast.xml");
 }
 
-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);
             }
         }