Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 12 insertions, 12 deletions

diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp
index 22e1ac4334..19ae03cdf9 100644
--- a/indra/llui/lldockablefloater.cpp
+++ b/indra/llui/lldockablefloater.cpp
@@ -40,9 +40,9 @@ void LLDockableFloater::init(LLDockableFloater* thiz)
     thiz->resetInstance();
 
     // all dockable floaters should have close, dock and minimize buttons
-    thiz->setCanClose(TRUE);
+    thiz->setCanClose(true);
     thiz->setCanDock(true);
-    thiz->setCanMinimize(TRUE);
+    thiz->setCanMinimize(true);
     thiz->setOverlapsScreenChannel(false);
     thiz->mForceDocking = false;
 }
@@ -74,7 +74,7 @@ LLDockableFloater::~LLDockableFloater()
 {
 }
 
-BOOL LLDockableFloater::postBuild()
+bool LLDockableFloater::postBuild()
 {
     // Remember we should force docking when the floater is opened for the first time
     if (mIsDockedStateForcedCallback != NULL && mIsDockedStateForcedCallback())
@@ -108,14 +108,14 @@ void LLDockableFloater::toggleInstance(const LLSD& sdname)
     // if floater undocked
     else if (instance != NULL)
     {
-        instance->setMinimized(FALSE);
+        instance->setMinimized(false);
         if (instance->getVisible())
         {
-            instance->setVisible(FALSE);
+            instance->setVisible(false);
         }
         else
         {
-            instance->setVisible(TRUE);
+            instance->setVisible(true);
             gFloaterView->bringToFront(instance);
         }
     }
@@ -127,13 +127,13 @@ void LLDockableFloater::resetInstance()
     {
         if (sInstanceHandle.get() != NULL && sInstanceHandle.get()->isDocked())
         {
-            sInstanceHandle.get()->setVisible(FALSE);
+            sInstanceHandle.get()->setVisible(false);
         }
         sInstanceHandle = getHandle();
     }
 }
 
-void LLDockableFloater::setVisible(BOOL visible)
+void LLDockableFloater::setVisible(bool visible)
 {
     // Force docking if requested
     if (visible && mForceDocking)
@@ -160,12 +160,12 @@ void LLDockableFloater::setVisible(BOOL visible)
     LLFloater::setVisible(visible);
 }
 
-void LLDockableFloater::setMinimized(BOOL minimize)
+void LLDockableFloater::setMinimized(bool minimize)
 {
     if(minimize && isDocked())
     {
         // minimizing a docked floater just hides it
-        setVisible(FALSE);
+        setVisible(false);
     }
     else
     {
@@ -185,14 +185,14 @@ LLView * LLDockableFloater::getDockWidget()
 
 void LLDockableFloater::onDockHidden()
 {
-    setCanDock(FALSE);
+    setCanDock(false);
 }
 
 void LLDockableFloater::onDockShown()
 {
     if (!isMinimized())
     {
-        setCanDock(TRUE);
+        setCanDock(true);
     }
 }