summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolcomp.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/lltoolcomp.cpp')
-rw-r--r--indra/newview/lltoolcomp.cpp70
1 files changed, 35 insertions, 35 deletions
diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp
index 9f25a1c075..999b16ad22 100644
--- a/indra/newview/lltoolcomp.cpp
+++ b/indra/newview/lltoolcomp.cpp
@@ -83,8 +83,8 @@ LLToolComposite::LLToolComposite(const std::string& name)
: LLTool(name),
mCur(sNullTool),
mDefault(sNullTool),
- mSelected(FALSE),
- mMouseDown(FALSE), mManip(NULL), mSelectRect(NULL)
+ mSelected(false),
+ mMouseDown(false), mManip(NULL), mSelectRect(NULL)
{
}
@@ -105,7 +105,7 @@ void LLToolComposite::onMouseCaptureLost()
setCurrentTool( mDefault );
}
-BOOL LLToolComposite::isSelecting()
+bool LLToolComposite::isSelecting()
{
return mCur == mSelectRect;
}
@@ -118,14 +118,14 @@ void LLToolComposite::handleSelect()
}
mCur = mDefault;
mCur->handleSelect();
- mSelected = TRUE;
+ mSelected = true;
}
void LLToolComposite::handleDeselect()
{
mCur->handleDeselect();
mCur = mDefault;
- mSelected = FALSE;
+ mSelected = false;
}
//----------------------------------------------------------------------------
@@ -134,7 +134,7 @@ void LLToolComposite::handleDeselect()
LLToolCompInspect::LLToolCompInspect()
: LLToolComposite(std::string("Inspect")),
- mIsToolCameraActive(FALSE)
+ mIsToolCameraActive(false)
{
mSelectRect = new LLToolSelectRect(this);
mDefault = mSelectRect;
@@ -157,7 +157,7 @@ bool LLToolCompInspect::handleMouseDown(S32 x, S32 y, MASK mask)
}
else
{
- mMouseDown = TRUE;
+ mMouseDown = true;
gViewerWindow->pickAsync(x, y, mask, pickCallback);
handled = true;
}
@@ -180,7 +180,7 @@ void LLToolCompInspect::pickCallback(const LLPickInfo& pick_info)
if (!tool_inspectp->mMouseDown)
{
// fast click on object, but mouse is already up...just do select
- tool_inspectp->mSelectRect->handleObjectSelection(pick_info, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
+ tool_inspectp->mSelectRect->handleObjectSelection(pick_info, gSavedSettings.getBOOL("EditLinkedParts"), false);
return;
}
@@ -190,7 +190,7 @@ void LLToolCompInspect::pickCallback(const LLPickInfo& pick_info)
}
tool_inspectp->setCurrentTool( tool_inspectp->mSelectRect );
- tool_inspectp->mIsToolCameraActive = FALSE;
+ tool_inspectp->mIsToolCameraActive = false;
tool_inspectp->mSelectRect->handlePick( pick_info );
}
@@ -199,15 +199,15 @@ bool LLToolCompInspect::handleDoubleClick(S32 x, S32 y, MASK mask)
return true;
}
-BOOL LLToolCompInspect::handleKey(KEY key, MASK mask)
+bool LLToolCompInspect::handleKey(KEY key, MASK mask)
{
- BOOL handled = FALSE;
+ bool handled = false;
if(KEY_ALT == key)
{
setCurrentTool(LLToolCamera::getInstance());
- mIsToolCameraActive = TRUE;
- handled = TRUE;
+ mIsToolCameraActive = true;
+ handled = true;
}
else
{
@@ -220,7 +220,7 @@ BOOL LLToolCompInspect::handleKey(KEY key, MASK mask)
void LLToolCompInspect::onMouseCaptureLost()
{
LLToolComposite::onMouseCaptureLost();
- mIsToolCameraActive = FALSE;
+ mIsToolCameraActive = false;
}
void LLToolCompInspect::keyUp(KEY key, MASK mask)
@@ -228,7 +228,7 @@ void LLToolCompInspect::keyUp(KEY key, MASK mask)
if (KEY_ALT == key && mCur == LLToolCamera::getInstance())
{
setCurrentTool(mDefault);
- mIsToolCameraActive = FALSE;
+ mIsToolCameraActive = false;
}
}
@@ -267,8 +267,8 @@ bool LLToolCompTranslate::handleHover(S32 x, S32 y, MASK mask)
bool LLToolCompTranslate::handleMouseDown(S32 x, S32 y, MASK mask)
{
- mMouseDown = TRUE;
- gViewerWindow->pickAsync(x, y, mask, pickCallback, /*BOOL pick_transparent*/ FALSE, LLFloaterReg::instanceVisible("build"), FALSE,
+ mMouseDown = true;
+ gViewerWindow->pickAsync(x, y, mask, pickCallback, /*bool pick_transparent*/ false, LLFloaterReg::instanceVisible("build"), false,
gSavedSettings.getBOOL("SelectReflectionProbes"));;
return true;
}
@@ -281,7 +281,7 @@ void LLToolCompTranslate::pickCallback(const LLPickInfo& pick_info)
if (!LLToolCompTranslate::getInstance()->mMouseDown)
{
// fast click on object, but mouse is already up...just do select
- LLToolCompTranslate::getInstance()->mSelectRect->handleObjectSelection(pick_info, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
+ LLToolCompTranslate::getInstance()->mSelectRect->handleObjectSelection(pick_info, gSavedSettings.getBOOL("EditLinkedParts"), false);
return;
}
@@ -292,7 +292,7 @@ void LLToolCompTranslate::pickCallback(const LLPickInfo& pick_info)
LLEditMenuHandler::gEditMenuHandler = LLSelectMgr::getInstance();
}
- BOOL can_move = LLToolCompTranslate::getInstance()->mManip->canAffectSelection();
+ bool can_move = LLToolCompTranslate::getInstance()->mManip->canAffectSelection();
if( LLManip::LL_NO_PART != LLToolCompTranslate::getInstance()->mManip->getHighlightedPart() && can_move)
{
@@ -317,7 +317,7 @@ void LLToolCompTranslate::pickCallback(const LLPickInfo& pick_info)
bool LLToolCompTranslate::handleMouseUp(S32 x, S32 y, MASK mask)
{
- mMouseDown = FALSE;
+ mMouseDown = false;
return LLToolComposite::handleMouseUp(x, y, mask);
}
@@ -394,7 +394,7 @@ bool LLToolCompScale::handleHover(S32 x, S32 y, MASK mask)
bool LLToolCompScale::handleMouseDown(S32 x, S32 y, MASK mask)
{
- mMouseDown = TRUE;
+ mMouseDown = true;
gViewerWindow->pickAsync(x, y, mask, pickCallback);
return true;
}
@@ -407,7 +407,7 @@ void LLToolCompScale::pickCallback(const LLPickInfo& pick_info)
if (!LLToolCompScale::getInstance()->mMouseDown)
{
// fast click on object, but mouse is already up...just do select
- LLToolCompScale::getInstance()->mSelectRect->handleObjectSelection(pick_info, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
+ LLToolCompScale::getInstance()->mSelectRect->handleObjectSelection(pick_info, gSavedSettings.getBOOL("EditLinkedParts"), false);
return;
}
@@ -438,7 +438,7 @@ void LLToolCompScale::pickCallback(const LLPickInfo& pick_info)
bool LLToolCompScale::handleMouseUp(S32 x, S32 y, MASK mask)
{
- mMouseDown = FALSE;
+ mMouseDown = false;
return LLToolComposite::handleMouseUp(x, y, mask);
}
@@ -493,7 +493,7 @@ LLToolCompCreate::LLToolCompCreate()
mCur = mPlacer;
mDefault = mPlacer;
- mObjectPlacedOnMouseDown = FALSE;
+ mObjectPlacedOnMouseDown = false;
}
@@ -507,7 +507,7 @@ LLToolCompCreate::~LLToolCompCreate()
bool LLToolCompCreate::handleMouseDown(S32 x, S32 y, MASK mask)
{
bool handled = false;
- mMouseDown = TRUE;
+ mMouseDown = true;
if ( (mask == MASK_SHIFT) || (mask == MASK_CONTROL) )
{
@@ -520,7 +520,7 @@ bool LLToolCompCreate::handleMouseDown(S32 x, S32 y, MASK mask)
handled = mPlacer->placeObject( x, y, mask );
}
- mObjectPlacedOnMouseDown = TRUE;
+ mObjectPlacedOnMouseDown = true;
return handled;
}
@@ -551,8 +551,8 @@ bool LLToolCompCreate::handleMouseUp(S32 x, S32 y, MASK mask)
handled = mPlacer->placeObject( x, y, mask );
}
- mObjectPlacedOnMouseDown = FALSE;
- mMouseDown = FALSE;
+ mObjectPlacedOnMouseDown = false;
+ mMouseDown = false;
if (!handled)
{
@@ -594,7 +594,7 @@ bool LLToolCompRotate::handleHover(S32 x, S32 y, MASK mask)
bool LLToolCompRotate::handleMouseDown(S32 x, S32 y, MASK mask)
{
- mMouseDown = TRUE;
+ mMouseDown = true;
gViewerWindow->pickAsync(x, y, mask, pickCallback);
return true;
}
@@ -607,7 +607,7 @@ void LLToolCompRotate::pickCallback(const LLPickInfo& pick_info)
if (!LLToolCompRotate::getInstance()->mMouseDown)
{
// fast click on object, but mouse is already up...just do select
- LLToolCompRotate::getInstance()->mSelectRect->handleObjectSelection(pick_info, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
+ LLToolCompRotate::getInstance()->mSelectRect->handleObjectSelection(pick_info, gSavedSettings.getBOOL("EditLinkedParts"), false);
return;
}
@@ -637,7 +637,7 @@ void LLToolCompRotate::pickCallback(const LLPickInfo& pick_info)
bool LLToolCompRotate::handleMouseUp(S32 x, S32 y, MASK mask)
{
- mMouseDown = FALSE;
+ mMouseDown = false;
return LLToolComposite::handleMouseUp(x, y, mask);
}
@@ -736,7 +736,7 @@ bool LLToolCompGun::handleHover(S32 x, S32 y, MASK mask)
else if ( mCur == mGrab && !(mask & MASK_ALT) )
{
setCurrentTool( (LLTool*) mGun );
- setMouseCapture(TRUE);
+ setMouseCapture(true);
}
}
@@ -786,7 +786,7 @@ bool LLToolCompGun::handleRightMouseDown(S32 x, S32 y, MASK mask)
// make the build menu appear.
setCurrentTool( (LLTool*) mNull );
- // This should return FALSE, meaning the context menu will
+ // This should return false, meaning the context menu will
// be shown.
return false;
*/
@@ -819,13 +819,13 @@ void LLToolCompGun::onMouseCaptureLost()
void LLToolCompGun::handleSelect()
{
LLToolComposite::handleSelect();
- setMouseCapture(TRUE);
+ setMouseCapture(true);
}
void LLToolCompGun::handleDeselect()
{
LLToolComposite::handleDeselect();
- setMouseCapture(FALSE);
+ setMouseCapture(false);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-02 05:45:18 +0000