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

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp
index 577d7625c7..22a9dd0027 100644
--- a/indra/newview/llscriptfloater.cpp
+++ b/indra/newview/llscriptfloater.cpp
@@ -87,8 +87,8 @@ bool LLScriptFloater::toggle(const LLUUID& notification_id)
         }
         else
         {
-            floater->setVisible(TRUE);
-            floater->setFocus(FALSE);
+            floater->setVisible(true);
+            floater->setFocus(false);
         }
     }
     // create and show new floater
@@ -113,7 +113,7 @@ LLScriptFloater* LLScriptFloater::show(const LLUUID& notification_id)
     floater->createForm(notification_id);
 
     //LLDialog(LLGiveInventory and LLLoadURL) should no longer steal focus (see EXT-5445)
-    floater->setAutoFocus(FALSE);
+    floater->setAutoFocus(false);
 
     if(LLScriptFloaterManager::OBJ_SCRIPT == LLScriptFloaterManager::getObjectType(notification_id))
     {
@@ -126,7 +126,7 @@ LLScriptFloater* LLScriptFloater::show(const LLUUID& notification_id)
     }
 
     //LLDialog(LLGiveInventory and LLLoadURL) should no longer steal focus (see EXT-5445)
-    LLFloaterReg::showTypedInstance<LLScriptFloater>("script_floater", notification_id, FALSE);
+    LLFloaterReg::showTypedInstance<LLScriptFloater>("script_floater", notification_id, false);
 
     return floater;
 }
@@ -205,7 +205,7 @@ void LLScriptFloater::setDocked(bool docked, bool pop_on_undock /* = true */)
     hideToastsIfNeeded();
 }
 
-void LLScriptFloater::setVisible(BOOL visible)
+void LLScriptFloater::setVisible(bool visible)
 {
     LLDockableFloater::setVisible(visible);