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

1 files changed, 6 insertions, 6 deletions

diff --git a/indra/newview/lltoolindividual.cpp b/indra/newview/lltoolindividual.cpp
index 50b4cb0c93..8962c55273 100644
--- a/indra/newview/lltoolindividual.cpp
+++ b/indra/newview/lltoolindividual.cpp
@@ -66,10 +66,10 @@ LLToolIndividual::~LLToolIndividual()
 {
 }
 
-BOOL LLToolIndividual::handleMouseDown(S32 x, S32 y, MASK mask)
+bool LLToolIndividual::handleMouseDown(S32 x, S32 y, MASK mask)
 {
     gViewerWindow->pickAsync(x, y, mask, pickCallback);
-    return TRUE;
+    return true;
 }
 
 void LLToolIndividual::pickCallback(const LLPickInfo& pick_info)
@@ -82,26 +82,26 @@ void LLToolIndividual::pickCallback(const LLPickInfo& pick_info)
     }
 }
 
-BOOL LLToolIndividual::handleDoubleClick(S32 x, S32 y, MASK mask)
+bool LLToolIndividual::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
     if(!LLSelectMgr::getInstance()->getSelection()->isEmpty())
     {
         // You should already have an object selected from the mousedown.
         // If so, show its inventory.
         LLFloaterReg::showInstance("build", "Content");
-        return TRUE;
+        return true;
     }
     else
     {
         // Nothing selected means the first mouse click was probably
         // bad, so try again.
-        return FALSE;
+        return false;
     }
 }
 
 void LLToolIndividual::handleSelect()
 {
-    const BOOL children_ok = TRUE;
+    const bool children_ok = true;
     LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok);
     LLSelectMgr::getInstance()->deselectAll();
     if(obj)