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

1 files changed, 10 insertions, 10 deletions

diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp
index 6b7f52b0d0..83abbb0357 100755
--- a/indra/newview/llfloatermap.cpp
+++ b/indra/newview/llfloatermap.cpp
@@ -75,7 +75,7 @@ LLFloaterMap::~LLFloaterMap()
 {
 }
 
-BOOL LLFloaterMap::postBuild()
+bool LLFloaterMap::postBuild()
 {
     mMap = getChild<LLNetMap>("Net Map");
     mMap->setToolTipMsg(getString("ToolTipMsg"));
@@ -117,13 +117,13 @@ BOOL LLFloaterMap::postBuild()
     return true;
 }
 
-BOOL LLFloaterMap::handleDoubleClick(S32 x, S32 y, MASK mask)
+bool LLFloaterMap::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
     // If floater is minimized, minimap should be shown on doubleclick (STORM-299)
     if (isMinimized())
     {
-        setMinimized(FALSE);
-        return TRUE;
+        setMinimized(false);
+        return true;
     }
 
     LLVector3d pos_global = mMap->viewPosToGlobal(x, y);
@@ -144,7 +144,7 @@ BOOL LLFloaterMap::handleDoubleClick(S32 x, S32 y, MASK mask)
     {
         LLFloaterReg::showInstance("world_map");
     }
-    return TRUE;
+    return true;
 }
 
 void LLFloaterMap::setDirectionPos(LLTextBox *text_box, F32 rotation)
@@ -229,19 +229,19 @@ void LLFloaterMap::draw()
     // Note: we can't just gAgent.check cameraMouselook() because the transition states are wrong.
     if(gAgentCamera.cameraMouselook())
     {
-        setMouseOpaque(FALSE);
-        getDragHandle()->setMouseOpaque(FALSE);
+        setMouseOpaque(false);
+        getDragHandle()->setMouseOpaque(false);
     }
     else
     {
-        setMouseOpaque(TRUE);
-        getDragHandle()->setMouseOpaque(TRUE);
+        setMouseOpaque(true);
+        getDragHandle()->setMouseOpaque(true);
     }
 
     LLFloater::draw();
 }
 
-void LLFloaterMap::reshape(S32 width, S32 height, BOOL called_from_parent)
+void LLFloaterMap::reshape(S32 width, S32 height, bool called_from_parent)
 {
     LLFloater::reshape(width, height, called_from_parent);