Fix line endlings

1 files changed, 840 insertions, 840 deletions

diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp
index e0310e8885..c6e59a81c9 100644
--- a/indra/newview/lltoolcomp.cpp
+++ b/indra/newview/lltoolcomp.cpp
@@ -1,840 +1,840 @@
-/**

- * @file lltoolcomp.cpp

- * @brief Composite tools

- *

- * $LicenseInfo:firstyear=2001&license=viewerlgpl$

- * Second Life Viewer Source Code

- * Copyright (C) 2010, Linden Research, Inc.

- *

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation;

- * version 2.1 of the License only.

- *

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- *

- * You should have received a copy of the GNU Lesser General Public

- * License along with this library; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

- *

- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA

- * $/LicenseInfo$

- */

-

-#include "llviewerprecompiledheaders.h"

-

-#include "lltoolcomp.h"

-

-#include "llfloaterreg.h"

-#include "llgl.h"

-#include "indra_constants.h"

-

-#include "llmanip.h"

-#include "llmaniprotate.h"

-#include "llmanipscale.h"

-#include "llmaniptranslate.h"

-#include "llmenugl.h"           // for right-click menu hack

-#include "llselectmgr.h"

-#include "lltoolfocus.h"

-#include "lltoolgrab.h"

-#include "lltoolgun.h"

-#include "lltoolmgr.h"

-#include "lltoolselectrect.h"

-#include "lltoolplacer.h"

-#include "llviewerinput.h"

-#include "llviewermenu.h"

-#include "llviewerobject.h"

-#include "llviewerwindow.h"

-#include "llagent.h"

-#include "llagentcamera.h"

-#include "llfloatertools.h"

-#include "llviewercontrol.h"

-

-extern LLControlGroup gSavedSettings;

-

-// we use this in various places instead of NULL

-static LLPointer<LLTool> sNullTool(new LLTool(std::string("null"), NULL));

-

-//-----------------------------------------------------------------------

-// LLToolComposite

-

-//static

-void LLToolComposite::setCurrentTool( LLTool* new_tool )

-{

-    if( mCur != new_tool )

-    {

-        if( mSelected )

-        {

-            mCur->handleDeselect();

-            mCur = new_tool;

-            mCur->handleSelect();

-        }

-        else

-        {

-            mCur = new_tool;

-        }

-    }

-}

-

-LLToolComposite::LLToolComposite(const std::string& name)

-    : LLTool(name),

-      mCur(sNullTool),

-      mDefault(sNullTool),

-      mSelected(false),

-      mMouseDown(false), mManip(NULL), mSelectRect(NULL)

-{

-}

-

-// Returns to the default tool

-bool LLToolComposite::handleMouseUp(S32 x, S32 y, MASK mask)

-{

-    bool handled = mCur->handleMouseUp( x, y, mask );

-    if( handled )

-    {

-        setCurrentTool( mDefault );

-    }

- return handled;

-}

-

-void LLToolComposite::onMouseCaptureLost()

-{

-    mCur->onMouseCaptureLost();

-    setCurrentTool( mDefault );

-}

-

-bool LLToolComposite::isSelecting()

-{

-    return mCur == mSelectRect;

-}

-

-void LLToolComposite::handleSelect()

-{

-    if (!gSavedSettings.getBOOL("EditLinkedParts"))

-    {

-        LLSelectMgr::getInstance()->promoteSelectionToRoot();

-    }

-    mCur = mDefault;

-    mCur->handleSelect();

-    mSelected = true;

-}

-

-void LLToolComposite::handleDeselect()

-{

-    mCur->handleDeselect();

-    mCur = mDefault;

-    mSelected = false;

-}

-

-//----------------------------------------------------------------------------

-// LLToolCompInspect

-//----------------------------------------------------------------------------

-

-LLToolCompInspect::LLToolCompInspect()

-: LLToolComposite(std::string("Inspect")),

-  mIsToolCameraActive(false)

-{

-    mSelectRect     = new LLToolSelectRect(this);

-    mDefault = mSelectRect;

-}

-

-

-LLToolCompInspect::~LLToolCompInspect()

-{

-    delete mSelectRect;

-    mSelectRect = NULL;

-}

-

-bool LLToolCompInspect::handleMouseDown(S32 x, S32 y, MASK mask)

-{

-    bool handled = false;

-

-    if (mCur == LLToolCamera::getInstance())

-    {

-        handled = mCur->handleMouseDown(x, y, mask);

-    }

-    else

-    {

-        mMouseDown = true;

-        gViewerWindow->pickAsync(x, y, mask, pickCallback);

-        handled = true;

-    }

-

-    return handled;

-}

-

-bool LLToolCompInspect::handleMouseUp(S32 x, S32 y, MASK mask)

-{

-    bool handled = LLToolComposite::handleMouseUp(x, y, mask);

-    mIsToolCameraActive = getCurrentTool() == LLToolCamera::getInstance();

-    return handled;

-}

-

-void LLToolCompInspect::pickCallback(const LLPickInfo& pick_info)

-{

-    LLViewerObject* hit_obj = pick_info.getObject();

-    LLToolCompInspect * tool_inspectp = LLToolCompInspect::getInstance();

-

-    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);

-        return;

-    }

-

-    LLSelectMgr * mgr_selectp = LLSelectMgr::getInstance();

-    if( hit_obj && mgr_selectp->getSelection()->getObjectCount()) {

-        LLEditMenuHandler::gEditMenuHandler = mgr_selectp;

-    }

-

-    tool_inspectp->setCurrentTool( tool_inspectp->mSelectRect );

-    tool_inspectp->mIsToolCameraActive = false;

-    tool_inspectp->mSelectRect->handlePick( pick_info );

-}

-

-bool LLToolCompInspect::handleDoubleClick(S32 x, S32 y, MASK mask)

-{

-    return true;

-}

-

-bool LLToolCompInspect::handleKey(KEY key, MASK mask)

-{

-    bool handled = false;

-

-    if(KEY_ALT == key)

-    {

-        setCurrentTool(LLToolCamera::getInstance());

-        mIsToolCameraActive = true;

-        handled = true;

-    }

-    else

-    {

-        handled = LLToolComposite::handleKey(key, mask);

-    }

-

-    return handled;

-}

-

-void LLToolCompInspect::onMouseCaptureLost()

-{

-    LLToolComposite::onMouseCaptureLost();

-    mIsToolCameraActive = false;

-}

-

-void LLToolCompInspect::keyUp(KEY key, MASK mask)

-{

-    if (KEY_ALT == key && mCur == LLToolCamera::getInstance())

-    {

-        setCurrentTool(mDefault);

-        mIsToolCameraActive = false;

-    }

-}

-

-//----------------------------------------------------------------------------

-// LLToolCompTranslate

-//----------------------------------------------------------------------------

-

-LLToolCompTranslate::LLToolCompTranslate()

-    : LLToolComposite(std::string("Move"))

-{

-    mManip      = new LLManipTranslate(this);

-    mSelectRect     = new LLToolSelectRect(this);

-

-    mCur            = mManip;

-    mDefault        = mManip;

-}

-

-LLToolCompTranslate::~LLToolCompTranslate()

-{

-    delete mManip;

-    mManip = NULL;

-

-    delete mSelectRect;

-    mSelectRect = NULL;

-}

-

-bool LLToolCompTranslate::handleHover(S32 x, S32 y, MASK mask)

-{

-    if( !mCur->hasMouseCapture() )

-    {

-        setCurrentTool( mManip );

-    }

-    return mCur->handleHover( x, y, 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,

-        gSavedSettings.getBOOL("SelectReflectionProbes"));;

-    return true;

-}

-

-void LLToolCompTranslate::pickCallback(const LLPickInfo& pick_info)

-{

-    LLViewerObject* hit_obj = pick_info.getObject();

-

-    LLToolCompTranslate::getInstance()->mManip->highlightManipulators(pick_info.mMousePt.mX, pick_info.mMousePt.mY);

-    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);

-        return;

-    }

-

-    if( hit_obj || LLToolCompTranslate::getInstance()->mManip->getHighlightedPart() != LLManip::LL_NO_PART )

-    {

-        if (LLToolCompTranslate::getInstance()->mManip->getSelection()->getObjectCount())

-        {

-            LLEditMenuHandler::gEditMenuHandler = LLSelectMgr::getInstance();

-        }

-

-        bool can_move = LLToolCompTranslate::getInstance()->mManip->canAffectSelection();

-

-        if( LLManip::LL_NO_PART != LLToolCompTranslate::getInstance()->mManip->getHighlightedPart() && can_move)

-        {

-            LLToolCompTranslate::getInstance()->setCurrentTool( LLToolCompTranslate::getInstance()->mManip );

-            LLToolCompTranslate::getInstance()->mManip->handleMouseDownOnPart( pick_info.mMousePt.mX, pick_info.mMousePt.mY, pick_info.mKeyMask );

-        }

-        else

-        {

-            LLToolCompTranslate::getInstance()->setCurrentTool( LLToolCompTranslate::getInstance()->mSelectRect );

-            LLToolCompTranslate::getInstance()->mSelectRect->handlePick( pick_info );

-

-            // *TODO: add toggle to trigger old click-drag functionality

-            // LLToolCompTranslate::getInstance()->mManip->handleMouseDownOnPart( XY_part, x, y, mask);

-        }

-    }

-    else

-    {

-        LLToolCompTranslate::getInstance()->setCurrentTool( LLToolCompTranslate::getInstance()->mSelectRect );

-        LLToolCompTranslate::getInstance()->mSelectRect->handlePick( pick_info );

-    }

-}

-

-bool LLToolCompTranslate::handleMouseUp(S32 x, S32 y, MASK mask)

-{

-    mMouseDown = false;

-    return LLToolComposite::handleMouseUp(x, y, mask);

-}

-

-LLTool* LLToolCompTranslate::getOverrideTool(MASK mask)

-{

-    if (mask == MASK_CONTROL)

-    {

-        return LLToolCompRotate::getInstance();

-    }

-    else if (mask == (MASK_CONTROL | MASK_SHIFT))

-    {

-        return LLToolCompScale::getInstance();

-    }

-    return LLToolComposite::getOverrideTool(mask);

-}

-

-bool LLToolCompTranslate::handleDoubleClick(S32 x, S32 y, MASK mask)

-{

-    if (mManip->getSelection()->isEmpty() && mManip->getHighlightedPart() == LLManip::LL_NO_PART)

-    {

-        // You should already have an object selected from the mousedown.

-        // If so, show its properties

-        LLFloaterReg::showInstance("build", "Content");

-        return true;

-    }

-    // Nothing selected means the first mouse click was probably

-    // bad, so try again.

-    // This also consumes the event to prevent things like double-click

-    // teleport from triggering.

-    return handleMouseDown(x, y, mask);

-}

-

-

-void LLToolCompTranslate::render()

-{

-    mCur->render(); // removing this will not draw the RGB arrows and guidelines

-

-    if( mCur != mManip )

-    {

-        LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);

-        mManip->renderGuidelines();

-    }

-}

-

-

-//-----------------------------------------------------------------------

-// LLToolCompScale

-

-LLToolCompScale::LLToolCompScale()

-    : LLToolComposite(std::string("Stretch"))

-{

-    mManip = new LLManipScale(this);

-    mSelectRect = new LLToolSelectRect(this);

-

-    mCur = mManip;

-    mDefault = mManip;

-}

-

-LLToolCompScale::~LLToolCompScale()

-{

-    delete mManip;

-    delete mSelectRect;

-}

-

-bool LLToolCompScale::handleHover(S32 x, S32 y, MASK mask)

-{

-    if( !mCur->hasMouseCapture() )

-    {

-        setCurrentTool(mManip );

-    }

-    return mCur->handleHover( x, y, mask );

-}

-

-

-bool LLToolCompScale::handleMouseDown(S32 x, S32 y, MASK mask)

-{

-    mMouseDown = true;

-    gViewerWindow->pickAsync(x, y, mask, pickCallback);

-    return true;

-}

-

-void LLToolCompScale::pickCallback(const LLPickInfo& pick_info)

-{

-    LLViewerObject* hit_obj = pick_info.getObject();

-

-    LLToolCompScale::getInstance()->mManip->highlightManipulators(pick_info.mMousePt.mX, pick_info.mMousePt.mY);

-    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);

-

-        return;

-    }

-

-    if( hit_obj || LLToolCompScale::getInstance()->mManip->getHighlightedPart() != LLManip::LL_NO_PART)

-    {

-        if (LLToolCompScale::getInstance()->mManip->getSelection()->getObjectCount())

-        {

-            LLEditMenuHandler::gEditMenuHandler = LLSelectMgr::getInstance();

-        }

-        if( LLManip::LL_NO_PART != LLToolCompScale::getInstance()->mManip->getHighlightedPart() )

-        {

-            LLToolCompScale::getInstance()->setCurrentTool( LLToolCompScale::getInstance()->mManip );

-            LLToolCompScale::getInstance()->mManip->handleMouseDownOnPart( pick_info.mMousePt.mX, pick_info.mMousePt.mY, pick_info.mKeyMask );

-        }

-        else

-        {

-            LLToolCompScale::getInstance()->setCurrentTool( LLToolCompScale::getInstance()->mSelectRect );

-            LLToolCompScale::getInstance()->mSelectRect->handlePick( pick_info );

-        }

-    }

-    else

-    {

-        LLToolCompScale::getInstance()->setCurrentTool( LLToolCompScale::getInstance()->mSelectRect );

-        LLToolCompScale::getInstance()->mSelectRect->handlePick( pick_info );

-    }

-}

-

-bool LLToolCompScale::handleMouseUp(S32 x, S32 y, MASK mask)

-{

-    mMouseDown = false;

-    return LLToolComposite::handleMouseUp(x, y, mask);

-}

-

-LLTool* LLToolCompScale::getOverrideTool(MASK mask)

-{

-    if (mask == MASK_CONTROL)

-    {

-        return LLToolCompRotate::getInstance();

-    }

-

-    return LLToolComposite::getOverrideTool(mask);

-}

-

-

-bool LLToolCompScale::handleDoubleClick(S32 x, S32 y, MASK mask)

-{

-    if (!mManip->getSelection()->isEmpty() && mManip->getHighlightedPart() == LLManip::LL_NO_PART)

-    {

-        // You should already have an object selected from the mousedown.

-        // If so, show its properties

-        LLFloaterReg::showInstance("build", "Content");

-        return true;

-    }

-    else

-    {

-        // Nothing selected means the first mouse click was probably

-        // bad, so try again.

-        return handleMouseDown(x, y, mask);

-    }

-}

-

-

-void LLToolCompScale::render()

-{

-    mCur->render();

-

-    if( mCur != mManip )

-    {

-        LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);

-        mManip->renderGuidelines();

-    }

-}

-

-//-----------------------------------------------------------------------

-// LLToolCompCreate

-

-LLToolCompCreate::LLToolCompCreate()

-    : LLToolComposite(std::string("Create"))

-{

-    mPlacer = new LLToolPlacer();

-    mSelectRect = new LLToolSelectRect(this);

-

-    mCur = mPlacer;

-    mDefault = mPlacer;

-    mObjectPlacedOnMouseDown = false;

-}

-

-

-LLToolCompCreate::~LLToolCompCreate()

-{

-    delete mPlacer;

-    delete mSelectRect;

-}

-

-

-bool LLToolCompCreate::handleMouseDown(S32 x, S32 y, MASK mask)

-{

-    bool handled = false;

-    mMouseDown = true;

-

-    if ( (mask == MASK_SHIFT) || (mask == MASK_CONTROL) )

-    {

-        gViewerWindow->pickAsync(x, y, mask, pickCallback);

-        handled = true;

-    }

-    else

-    {

-        setCurrentTool( mPlacer );

-        handled = mPlacer->placeObject( x, y, mask );

-    }

-

-    mObjectPlacedOnMouseDown = true;

-

-    return handled;

-}

-

-void LLToolCompCreate::pickCallback(const LLPickInfo& pick_info)

-{

-    // *NOTE: We mask off shift and control, so you cannot

-    // multi-select multiple objects with the create tool.

-    MASK mask = (pick_info.mKeyMask & ~MASK_SHIFT);

-    mask = (mask & ~MASK_CONTROL);

-

-    LLToolCompCreate::getInstance()->setCurrentTool( LLToolCompCreate::getInstance()->mSelectRect );

-    LLToolCompCreate::getInstance()->mSelectRect->handlePick( pick_info );

-}

-

-bool LLToolCompCreate::handleDoubleClick(S32 x, S32 y, MASK mask)

-{

-    return handleMouseDown(x, y, mask);

-}

-

-bool LLToolCompCreate::handleMouseUp(S32 x, S32 y, MASK mask)

-{

-    bool handled = false;

-

-    if ( mMouseDown && !mObjectPlacedOnMouseDown && !(mask == MASK_SHIFT) && !(mask == MASK_CONTROL) )

-    {

-        setCurrentTool( mPlacer );

-        handled = mPlacer->placeObject( x, y, mask );

-    }

-

-    mObjectPlacedOnMouseDown = false;

-    mMouseDown = false;

-

-    if (!handled)

-    {

-        handled = LLToolComposite::handleMouseUp(x, y, mask);

-    }

-

-    return handled;

-}

-

-//-----------------------------------------------------------------------

-// LLToolCompRotate

-

-LLToolCompRotate::LLToolCompRotate()

-    : LLToolComposite(std::string("Rotate"))

-{

-    mManip = new LLManipRotate(this);

-    mSelectRect = new LLToolSelectRect(this);

-

-    mCur = mManip;

-    mDefault = mManip;

-}

-

-

-LLToolCompRotate::~LLToolCompRotate()

-{

-    delete mManip;

-    delete mSelectRect;

-}

-

-bool LLToolCompRotate::handleHover(S32 x, S32 y, MASK mask)

-{

-    if( !mCur->hasMouseCapture() )

-    {

-        setCurrentTool( mManip );

-    }

-    return mCur->handleHover( x, y, mask );

-}

-

-

-bool LLToolCompRotate::handleMouseDown(S32 x, S32 y, MASK mask)

-{

-    mMouseDown = true;

-    gViewerWindow->pickAsync(x, y, mask, pickCallback);

-    return true;

-}

-

-void LLToolCompRotate::pickCallback(const LLPickInfo& pick_info)

-{

-    LLViewerObject* hit_obj = pick_info.getObject();

-

-    LLToolCompRotate::getInstance()->mManip->highlightManipulators(pick_info.mMousePt.mX, pick_info.mMousePt.mY);

-    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);

-        return;

-    }

-

-    if( hit_obj || LLToolCompRotate::getInstance()->mManip->getHighlightedPart() != LLManip::LL_NO_PART)

-    {

-        if (LLToolCompRotate::getInstance()->mManip->getSelection()->getObjectCount())

-        {

-            LLEditMenuHandler::gEditMenuHandler = LLSelectMgr::getInstance();

-        }

-        if( LLManip::LL_NO_PART != LLToolCompRotate::getInstance()->mManip->getHighlightedPart() )

-        {

-            LLToolCompRotate::getInstance()->setCurrentTool( LLToolCompRotate::getInstance()->mManip );

-            LLToolCompRotate::getInstance()->mManip->handleMouseDownOnPart( pick_info.mMousePt.mX, pick_info.mMousePt.mY, pick_info.mKeyMask );

-        }

-        else

-        {

-            LLToolCompRotate::getInstance()->setCurrentTool( LLToolCompRotate::getInstance()->mSelectRect );

-            LLToolCompRotate::getInstance()->mSelectRect->handlePick( pick_info );

-        }

-    }

-    else

-    {

-        LLToolCompRotate::getInstance()->setCurrentTool( LLToolCompRotate::getInstance()->mSelectRect );

-        LLToolCompRotate::getInstance()->mSelectRect->handlePick( pick_info );

-    }

-}

-

-bool LLToolCompRotate::handleMouseUp(S32 x, S32 y, MASK mask)

-{

-    mMouseDown = false;

-    return LLToolComposite::handleMouseUp(x, y, mask);

-}

-

-LLTool* LLToolCompRotate::getOverrideTool(MASK mask)

-{

-    if (mask == (MASK_CONTROL | MASK_SHIFT))

-    {

-        return LLToolCompScale::getInstance();

-    }

-    return LLToolComposite::getOverrideTool(mask);

-}

-

-bool LLToolCompRotate::handleDoubleClick(S32 x, S32 y, MASK mask)

-{

-    if (!mManip->getSelection()->isEmpty() && mManip->getHighlightedPart() == LLManip::LL_NO_PART)

-    {

-        // You should already have an object selected from the mousedown.

-        // If so, show its properties

-        LLFloaterReg::showInstance("build", "Content");

-        return true;

-    }

-    else

-    {

-        // Nothing selected means the first mouse click was probably

-        // bad, so try again.

-        return handleMouseDown(x, y, mask);

-    }

-}

-

-

-void LLToolCompRotate::render()

-{

-    mCur->render();

-

-    if( mCur != mManip )

-    {

-        LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);

-        mManip->renderGuidelines();

-    }

-}

-

-

-//-----------------------------------------------------------------------

-// LLToolCompGun

-

-LLToolCompGun::LLToolCompGun()

-    : LLToolComposite(std::string("Mouselook"))

-{

-    mGun = new LLToolGun(this);

-    mGrab = new LLToolGrabBase(this);

-    mNull = sNullTool;

-

-    setCurrentTool(mGun);

-    mDefault = mGun;

-}

-

-

-LLToolCompGun::~LLToolCompGun()

-{

-    delete mGun;

-    mGun = NULL;

-

-    delete mGrab;

-    mGrab = NULL;

-

-    // don't delete a static object

-    // delete mNull;

-    mNull = NULL;

-}

-

-bool LLToolCompGun::handleHover(S32 x, S32 y, MASK mask)

-{

-    // *NOTE: This hack is here to make mouselook kick in again after

-    // item selected from context menu.

-    if ( mCur == mNull && !gPopupMenuView->getVisible() )

-    {

-        LLSelectMgr::getInstance()->deselectAll();

-        setCurrentTool( (LLTool*) mGrab );

-    }

-

-    // Note: if the tool changed, we can't delegate the current mouse event

-    // after the change because tools can modify the mouse during selection and deselection.

-    // Instead we let the current tool handle the event and then make the change.

-    // The new tool will take effect on the next frame.

-

-    mCur->handleHover( x, y, mask );

-

-    // If mouse button not down...

-    if( !gViewerWindow->getLeftMouseDown())

-    {

-        // let ALT switch from gun to grab

-        if ( mCur == mGun && (mask & MASK_ALT) )

-        {

-            setCurrentTool( (LLTool*) mGrab );

-        }

-        else if ( mCur == mGrab && !(mask & MASK_ALT) )

-        {

-            setCurrentTool( (LLTool*) mGun );

-            setMouseCapture(true);

-        }

-    }

-

-    return true;

-}

-

-

-bool LLToolCompGun::handleMouseDown(S32 x, S32 y, MASK mask)

-{

-    // if the left button is grabbed, don't put up the pie menu

-    if (gAgent.leftButtonGrabbed() && gViewerInput.isLMouseHandlingDefault(MODE_FIRST_PERSON))

-    {

-        gAgent.setControlFlags(AGENT_CONTROL_ML_LBUTTON_DOWN);

-        return false;

-    }

-

-    // On mousedown, start grabbing

-    gGrabTransientTool = this;

-    LLToolMgr::getInstance()->getCurrentToolset()->selectTool( (LLTool*) mGrab );

-

-    return LLToolGrab::getInstance()->handleMouseDown(x, y, mask);

-}

-

-

-bool LLToolCompGun::handleDoubleClick(S32 x, S32 y, MASK mask)

-{

-    // if the left button is grabbed, don't put up the pie menu

-    if (gAgent.leftButtonGrabbed() && gViewerInput.isLMouseHandlingDefault(MODE_FIRST_PERSON))

-    {

-        gAgent.setControlFlags(AGENT_CONTROL_ML_LBUTTON_DOWN);

-        return false;

-    }

-

-    // On mousedown, start grabbing

-    gGrabTransientTool = this;

-    LLToolMgr::getInstance()->getCurrentToolset()->selectTool( (LLTool*) mGrab );

-

-    return LLToolGrab::getInstance()->handleDoubleClick(x, y, mask);

-}

-

-

-bool LLToolCompGun::handleRightMouseDown(S32 x, S32 y, MASK mask)

-{

-    /* JC - suppress context menu 8/29/2002

-

-    // On right mouse, go through some convoluted steps to

-    // make the build menu appear.

-    setCurrentTool( (LLTool*) mNull );

-

-    // This should return false, meaning the context menu will

-    // be shown.

-    return false;

-    */

-

-    // Returning true will suppress the context menu

-    return true;

-}

-

-

-bool LLToolCompGun::handleMouseUp(S32 x, S32 y, MASK mask)

-{

-    if (gViewerInput.isLMouseHandlingDefault(MODE_FIRST_PERSON))

-    {

-        gAgent.setControlFlags(AGENT_CONTROL_ML_LBUTTON_UP);

-    }

-    setCurrentTool( (LLTool*) mGun );

-    return true;

-}

-

-void LLToolCompGun::onMouseCaptureLost()

-{

-    if (mComposite)

-    {

-        mComposite->onMouseCaptureLost();

-        return;

-    }

-    mCur->onMouseCaptureLost();

-}

-

-void    LLToolCompGun::handleSelect()

-{

-    LLToolComposite::handleSelect();

-    setMouseCapture(true);

-}

-

-void    LLToolCompGun::handleDeselect()

-{

-    LLToolComposite::handleDeselect();

-    setMouseCapture(false);

-}

-

-

-bool LLToolCompGun::handleScrollWheel(S32 x, S32 y, S32 clicks)

-{

-    if (clicks > 0)

-    {

-        gAgentCamera.changeCameraToDefault();

-

-    }

-    return true;

-}

+/**
+ * @file lltoolcomp.cpp
+ * @brief Composite tools
+ *
+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "lltoolcomp.h"
+
+#include "llfloaterreg.h"
+#include "llgl.h"
+#include "indra_constants.h"
+
+#include "llmanip.h"
+#include "llmaniprotate.h"
+#include "llmanipscale.h"
+#include "llmaniptranslate.h"
+#include "llmenugl.h"           // for right-click menu hack
+#include "llselectmgr.h"
+#include "lltoolfocus.h"
+#include "lltoolgrab.h"
+#include "lltoolgun.h"
+#include "lltoolmgr.h"
+#include "lltoolselectrect.h"
+#include "lltoolplacer.h"
+#include "llviewerinput.h"
+#include "llviewermenu.h"
+#include "llviewerobject.h"
+#include "llviewerwindow.h"
+#include "llagent.h"
+#include "llagentcamera.h"
+#include "llfloatertools.h"
+#include "llviewercontrol.h"
+
+extern LLControlGroup gSavedSettings;
+
+// we use this in various places instead of NULL
+static LLPointer<LLTool> sNullTool(new LLTool(std::string("null"), NULL));
+
+//-----------------------------------------------------------------------
+// LLToolComposite
+
+//static
+void LLToolComposite::setCurrentTool( LLTool* new_tool )
+{
+    if( mCur != new_tool )
+    {
+        if( mSelected )
+        {
+            mCur->handleDeselect();
+            mCur = new_tool;
+            mCur->handleSelect();
+        }
+        else
+        {
+            mCur = new_tool;
+        }
+    }
+}
+
+LLToolComposite::LLToolComposite(const std::string& name)
+    : LLTool(name),
+      mCur(sNullTool),
+      mDefault(sNullTool),
+      mSelected(false),
+      mMouseDown(false), mManip(NULL), mSelectRect(NULL)
+{
+}
+
+// Returns to the default tool
+bool LLToolComposite::handleMouseUp(S32 x, S32 y, MASK mask)
+{
+    bool handled = mCur->handleMouseUp( x, y, mask );
+    if( handled )
+    {
+        setCurrentTool( mDefault );
+    }
+ return handled;
+}
+
+void LLToolComposite::onMouseCaptureLost()
+{
+    mCur->onMouseCaptureLost();
+    setCurrentTool( mDefault );
+}
+
+bool LLToolComposite::isSelecting()
+{
+    return mCur == mSelectRect;
+}
+
+void LLToolComposite::handleSelect()
+{
+    if (!gSavedSettings.getBOOL("EditLinkedParts"))
+    {
+        LLSelectMgr::getInstance()->promoteSelectionToRoot();
+    }
+    mCur = mDefault;
+    mCur->handleSelect();
+    mSelected = true;
+}
+
+void LLToolComposite::handleDeselect()
+{
+    mCur->handleDeselect();
+    mCur = mDefault;
+    mSelected = false;
+}
+
+//----------------------------------------------------------------------------
+// LLToolCompInspect
+//----------------------------------------------------------------------------
+
+LLToolCompInspect::LLToolCompInspect()
+: LLToolComposite(std::string("Inspect")),
+  mIsToolCameraActive(false)
+{
+    mSelectRect     = new LLToolSelectRect(this);
+    mDefault = mSelectRect;
+}
+
+
+LLToolCompInspect::~LLToolCompInspect()
+{
+    delete mSelectRect;
+    mSelectRect = NULL;
+}
+
+bool LLToolCompInspect::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+    bool handled = false;
+
+    if (mCur == LLToolCamera::getInstance())
+    {
+        handled = mCur->handleMouseDown(x, y, mask);
+    }
+    else
+    {
+        mMouseDown = true;
+        gViewerWindow->pickAsync(x, y, mask, pickCallback);
+        handled = true;
+    }
+
+    return handled;
+}
+
+bool LLToolCompInspect::handleMouseUp(S32 x, S32 y, MASK mask)
+{
+    bool handled = LLToolComposite::handleMouseUp(x, y, mask);
+    mIsToolCameraActive = getCurrentTool() == LLToolCamera::getInstance();
+    return handled;
+}
+
+void LLToolCompInspect::pickCallback(const LLPickInfo& pick_info)
+{
+    LLViewerObject* hit_obj = pick_info.getObject();
+    LLToolCompInspect * tool_inspectp = LLToolCompInspect::getInstance();
+
+    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);
+        return;
+    }
+
+    LLSelectMgr * mgr_selectp = LLSelectMgr::getInstance();
+    if( hit_obj && mgr_selectp->getSelection()->getObjectCount()) {
+        LLEditMenuHandler::gEditMenuHandler = mgr_selectp;
+    }
+
+    tool_inspectp->setCurrentTool( tool_inspectp->mSelectRect );
+    tool_inspectp->mIsToolCameraActive = false;
+    tool_inspectp->mSelectRect->handlePick( pick_info );
+}
+
+bool LLToolCompInspect::handleDoubleClick(S32 x, S32 y, MASK mask)
+{
+    return true;
+}
+
+bool LLToolCompInspect::handleKey(KEY key, MASK mask)
+{
+    bool handled = false;
+
+    if(KEY_ALT == key)
+    {
+        setCurrentTool(LLToolCamera::getInstance());
+        mIsToolCameraActive = true;
+        handled = true;
+    }
+    else
+    {
+        handled = LLToolComposite::handleKey(key, mask);
+    }
+
+    return handled;
+}
+
+void LLToolCompInspect::onMouseCaptureLost()
+{
+    LLToolComposite::onMouseCaptureLost();
+    mIsToolCameraActive = false;
+}
+
+void LLToolCompInspect::keyUp(KEY key, MASK mask)
+{
+    if (KEY_ALT == key && mCur == LLToolCamera::getInstance())
+    {
+        setCurrentTool(mDefault);
+        mIsToolCameraActive = false;
+    }
+}
+
+//----------------------------------------------------------------------------
+// LLToolCompTranslate
+//----------------------------------------------------------------------------
+
+LLToolCompTranslate::LLToolCompTranslate()
+    : LLToolComposite(std::string("Move"))
+{
+    mManip      = new LLManipTranslate(this);
+    mSelectRect     = new LLToolSelectRect(this);
+
+    mCur            = mManip;
+    mDefault        = mManip;
+}
+
+LLToolCompTranslate::~LLToolCompTranslate()
+{
+    delete mManip;
+    mManip = NULL;
+
+    delete mSelectRect;
+    mSelectRect = NULL;
+}
+
+bool LLToolCompTranslate::handleHover(S32 x, S32 y, MASK mask)
+{
+    if( !mCur->hasMouseCapture() )
+    {
+        setCurrentTool( mManip );
+    }
+    return mCur->handleHover( x, y, 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,
+        gSavedSettings.getBOOL("SelectReflectionProbes"));;
+    return true;
+}
+
+void LLToolCompTranslate::pickCallback(const LLPickInfo& pick_info)
+{
+    LLViewerObject* hit_obj = pick_info.getObject();
+
+    LLToolCompTranslate::getInstance()->mManip->highlightManipulators(pick_info.mMousePt.mX, pick_info.mMousePt.mY);
+    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);
+        return;
+    }
+
+    if( hit_obj || LLToolCompTranslate::getInstance()->mManip->getHighlightedPart() != LLManip::LL_NO_PART )
+    {
+        if (LLToolCompTranslate::getInstance()->mManip->getSelection()->getObjectCount())
+        {
+            LLEditMenuHandler::gEditMenuHandler = LLSelectMgr::getInstance();
+        }
+
+        bool can_move = LLToolCompTranslate::getInstance()->mManip->canAffectSelection();
+
+        if( LLManip::LL_NO_PART != LLToolCompTranslate::getInstance()->mManip->getHighlightedPart() && can_move)
+        {
+            LLToolCompTranslate::getInstance()->setCurrentTool( LLToolCompTranslate::getInstance()->mManip );
+            LLToolCompTranslate::getInstance()->mManip->handleMouseDownOnPart( pick_info.mMousePt.mX, pick_info.mMousePt.mY, pick_info.mKeyMask );
+        }
+        else
+        {
+            LLToolCompTranslate::getInstance()->setCurrentTool( LLToolCompTranslate::getInstance()->mSelectRect );
+            LLToolCompTranslate::getInstance()->mSelectRect->handlePick( pick_info );
+
+            // *TODO: add toggle to trigger old click-drag functionality
+            // LLToolCompTranslate::getInstance()->mManip->handleMouseDownOnPart( XY_part, x, y, mask);
+        }
+    }
+    else
+    {
+        LLToolCompTranslate::getInstance()->setCurrentTool( LLToolCompTranslate::getInstance()->mSelectRect );
+        LLToolCompTranslate::getInstance()->mSelectRect->handlePick( pick_info );
+    }
+}
+
+bool LLToolCompTranslate::handleMouseUp(S32 x, S32 y, MASK mask)
+{
+    mMouseDown = false;
+    return LLToolComposite::handleMouseUp(x, y, mask);
+}
+
+LLTool* LLToolCompTranslate::getOverrideTool(MASK mask)
+{
+    if (mask == MASK_CONTROL)
+    {
+        return LLToolCompRotate::getInstance();
+    }
+    else if (mask == (MASK_CONTROL | MASK_SHIFT))
+    {
+        return LLToolCompScale::getInstance();
+    }
+    return LLToolComposite::getOverrideTool(mask);
+}
+
+bool LLToolCompTranslate::handleDoubleClick(S32 x, S32 y, MASK mask)
+{
+    if (mManip->getSelection()->isEmpty() && mManip->getHighlightedPart() == LLManip::LL_NO_PART)
+    {
+        // You should already have an object selected from the mousedown.
+        // If so, show its properties
+        LLFloaterReg::showInstance("build", "Content");
+        return true;
+    }
+    // Nothing selected means the first mouse click was probably
+    // bad, so try again.
+    // This also consumes the event to prevent things like double-click
+    // teleport from triggering.
+    return handleMouseDown(x, y, mask);
+}
+
+
+void LLToolCompTranslate::render()
+{
+    mCur->render(); // removing this will not draw the RGB arrows and guidelines
+
+    if( mCur != mManip )
+    {
+        LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
+        mManip->renderGuidelines();
+    }
+}
+
+
+//-----------------------------------------------------------------------
+// LLToolCompScale
+
+LLToolCompScale::LLToolCompScale()
+    : LLToolComposite(std::string("Stretch"))
+{
+    mManip = new LLManipScale(this);
+    mSelectRect = new LLToolSelectRect(this);
+
+    mCur = mManip;
+    mDefault = mManip;
+}
+
+LLToolCompScale::~LLToolCompScale()
+{
+    delete mManip;
+    delete mSelectRect;
+}
+
+bool LLToolCompScale::handleHover(S32 x, S32 y, MASK mask)
+{
+    if( !mCur->hasMouseCapture() )
+    {
+        setCurrentTool(mManip );
+    }
+    return mCur->handleHover( x, y, mask );
+}
+
+
+bool LLToolCompScale::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+    mMouseDown = true;
+    gViewerWindow->pickAsync(x, y, mask, pickCallback);
+    return true;
+}
+
+void LLToolCompScale::pickCallback(const LLPickInfo& pick_info)
+{
+    LLViewerObject* hit_obj = pick_info.getObject();
+
+    LLToolCompScale::getInstance()->mManip->highlightManipulators(pick_info.mMousePt.mX, pick_info.mMousePt.mY);
+    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);
+
+        return;
+    }
+
+    if( hit_obj || LLToolCompScale::getInstance()->mManip->getHighlightedPart() != LLManip::LL_NO_PART)
+    {
+        if (LLToolCompScale::getInstance()->mManip->getSelection()->getObjectCount())
+        {
+            LLEditMenuHandler::gEditMenuHandler = LLSelectMgr::getInstance();
+        }
+        if( LLManip::LL_NO_PART != LLToolCompScale::getInstance()->mManip->getHighlightedPart() )
+        {
+            LLToolCompScale::getInstance()->setCurrentTool( LLToolCompScale::getInstance()->mManip );
+            LLToolCompScale::getInstance()->mManip->handleMouseDownOnPart( pick_info.mMousePt.mX, pick_info.mMousePt.mY, pick_info.mKeyMask );
+        }
+        else
+        {
+            LLToolCompScale::getInstance()->setCurrentTool( LLToolCompScale::getInstance()->mSelectRect );
+            LLToolCompScale::getInstance()->mSelectRect->handlePick( pick_info );
+        }
+    }
+    else
+    {
+        LLToolCompScale::getInstance()->setCurrentTool( LLToolCompScale::getInstance()->mSelectRect );
+        LLToolCompScale::getInstance()->mSelectRect->handlePick( pick_info );
+    }
+}
+
+bool LLToolCompScale::handleMouseUp(S32 x, S32 y, MASK mask)
+{
+    mMouseDown = false;
+    return LLToolComposite::handleMouseUp(x, y, mask);
+}
+
+LLTool* LLToolCompScale::getOverrideTool(MASK mask)
+{
+    if (mask == MASK_CONTROL)
+    {
+        return LLToolCompRotate::getInstance();
+    }
+
+    return LLToolComposite::getOverrideTool(mask);
+}
+
+
+bool LLToolCompScale::handleDoubleClick(S32 x, S32 y, MASK mask)
+{
+    if (!mManip->getSelection()->isEmpty() && mManip->getHighlightedPart() == LLManip::LL_NO_PART)
+    {
+        // You should already have an object selected from the mousedown.
+        // If so, show its properties
+        LLFloaterReg::showInstance("build", "Content");
+        return true;
+    }
+    else
+    {
+        // Nothing selected means the first mouse click was probably
+        // bad, so try again.
+        return handleMouseDown(x, y, mask);
+    }
+}
+
+
+void LLToolCompScale::render()
+{
+    mCur->render();
+
+    if( mCur != mManip )
+    {
+        LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
+        mManip->renderGuidelines();
+    }
+}
+
+//-----------------------------------------------------------------------
+// LLToolCompCreate
+
+LLToolCompCreate::LLToolCompCreate()
+    : LLToolComposite(std::string("Create"))
+{
+    mPlacer = new LLToolPlacer();
+    mSelectRect = new LLToolSelectRect(this);
+
+    mCur = mPlacer;
+    mDefault = mPlacer;
+    mObjectPlacedOnMouseDown = false;
+}
+
+
+LLToolCompCreate::~LLToolCompCreate()
+{
+    delete mPlacer;
+    delete mSelectRect;
+}
+
+
+bool LLToolCompCreate::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+    bool handled = false;
+    mMouseDown = true;
+
+    if ( (mask == MASK_SHIFT) || (mask == MASK_CONTROL) )
+    {
+        gViewerWindow->pickAsync(x, y, mask, pickCallback);
+        handled = true;
+    }
+    else
+    {
+        setCurrentTool( mPlacer );
+        handled = mPlacer->placeObject( x, y, mask );
+    }
+
+    mObjectPlacedOnMouseDown = true;
+
+    return handled;
+}
+
+void LLToolCompCreate::pickCallback(const LLPickInfo& pick_info)
+{
+    // *NOTE: We mask off shift and control, so you cannot
+    // multi-select multiple objects with the create tool.
+    MASK mask = (pick_info.mKeyMask & ~MASK_SHIFT);
+    mask = (mask & ~MASK_CONTROL);
+
+    LLToolCompCreate::getInstance()->setCurrentTool( LLToolCompCreate::getInstance()->mSelectRect );
+    LLToolCompCreate::getInstance()->mSelectRect->handlePick( pick_info );
+}
+
+bool LLToolCompCreate::handleDoubleClick(S32 x, S32 y, MASK mask)
+{
+    return handleMouseDown(x, y, mask);
+}
+
+bool LLToolCompCreate::handleMouseUp(S32 x, S32 y, MASK mask)
+{
+    bool handled = false;
+
+    if ( mMouseDown && !mObjectPlacedOnMouseDown && !(mask == MASK_SHIFT) && !(mask == MASK_CONTROL) )
+    {
+        setCurrentTool( mPlacer );
+        handled = mPlacer->placeObject( x, y, mask );
+    }
+
+    mObjectPlacedOnMouseDown = false;
+    mMouseDown = false;
+
+    if (!handled)
+    {
+        handled = LLToolComposite::handleMouseUp(x, y, mask);
+    }
+
+    return handled;
+}
+
+//-----------------------------------------------------------------------
+// LLToolCompRotate
+
+LLToolCompRotate::LLToolCompRotate()
+    : LLToolComposite(std::string("Rotate"))
+{
+    mManip = new LLManipRotate(this);
+    mSelectRect = new LLToolSelectRect(this);
+
+    mCur = mManip;
+    mDefault = mManip;
+}
+
+
+LLToolCompRotate::~LLToolCompRotate()
+{
+    delete mManip;
+    delete mSelectRect;
+}
+
+bool LLToolCompRotate::handleHover(S32 x, S32 y, MASK mask)
+{
+    if( !mCur->hasMouseCapture() )
+    {
+        setCurrentTool( mManip );
+    }
+    return mCur->handleHover( x, y, mask );
+}
+
+
+bool LLToolCompRotate::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+    mMouseDown = true;
+    gViewerWindow->pickAsync(x, y, mask, pickCallback);
+    return true;
+}
+
+void LLToolCompRotate::pickCallback(const LLPickInfo& pick_info)
+{
+    LLViewerObject* hit_obj = pick_info.getObject();
+
+    LLToolCompRotate::getInstance()->mManip->highlightManipulators(pick_info.mMousePt.mX, pick_info.mMousePt.mY);
+    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);
+        return;
+    }
+
+    if( hit_obj || LLToolCompRotate::getInstance()->mManip->getHighlightedPart() != LLManip::LL_NO_PART)
+    {
+        if (LLToolCompRotate::getInstance()->mManip->getSelection()->getObjectCount())
+        {
+            LLEditMenuHandler::gEditMenuHandler = LLSelectMgr::getInstance();
+        }
+        if( LLManip::LL_NO_PART != LLToolCompRotate::getInstance()->mManip->getHighlightedPart() )
+        {
+            LLToolCompRotate::getInstance()->setCurrentTool( LLToolCompRotate::getInstance()->mManip );
+            LLToolCompRotate::getInstance()->mManip->handleMouseDownOnPart( pick_info.mMousePt.mX, pick_info.mMousePt.mY, pick_info.mKeyMask );
+        }
+        else
+        {
+            LLToolCompRotate::getInstance()->setCurrentTool( LLToolCompRotate::getInstance()->mSelectRect );
+            LLToolCompRotate::getInstance()->mSelectRect->handlePick( pick_info );
+        }
+    }
+    else
+    {
+        LLToolCompRotate::getInstance()->setCurrentTool( LLToolCompRotate::getInstance()->mSelectRect );
+        LLToolCompRotate::getInstance()->mSelectRect->handlePick( pick_info );
+    }
+}
+
+bool LLToolCompRotate::handleMouseUp(S32 x, S32 y, MASK mask)
+{
+    mMouseDown = false;
+    return LLToolComposite::handleMouseUp(x, y, mask);
+}
+
+LLTool* LLToolCompRotate::getOverrideTool(MASK mask)
+{
+    if (mask == (MASK_CONTROL | MASK_SHIFT))
+    {
+        return LLToolCompScale::getInstance();
+    }
+    return LLToolComposite::getOverrideTool(mask);
+}
+
+bool LLToolCompRotate::handleDoubleClick(S32 x, S32 y, MASK mask)
+{
+    if (!mManip->getSelection()->isEmpty() && mManip->getHighlightedPart() == LLManip::LL_NO_PART)
+    {
+        // You should already have an object selected from the mousedown.
+        // If so, show its properties
+        LLFloaterReg::showInstance("build", "Content");
+        return true;
+    }
+    else
+    {
+        // Nothing selected means the first mouse click was probably
+        // bad, so try again.
+        return handleMouseDown(x, y, mask);
+    }
+}
+
+
+void LLToolCompRotate::render()
+{
+    mCur->render();
+
+    if( mCur != mManip )
+    {
+        LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
+        mManip->renderGuidelines();
+    }
+}
+
+
+//-----------------------------------------------------------------------
+// LLToolCompGun
+
+LLToolCompGun::LLToolCompGun()
+    : LLToolComposite(std::string("Mouselook"))
+{
+    mGun = new LLToolGun(this);
+    mGrab = new LLToolGrabBase(this);
+    mNull = sNullTool;
+
+    setCurrentTool(mGun);
+    mDefault = mGun;
+}
+
+
+LLToolCompGun::~LLToolCompGun()
+{
+    delete mGun;
+    mGun = NULL;
+
+    delete mGrab;
+    mGrab = NULL;
+
+    // don't delete a static object
+    // delete mNull;
+    mNull = NULL;
+}
+
+bool LLToolCompGun::handleHover(S32 x, S32 y, MASK mask)
+{
+    // *NOTE: This hack is here to make mouselook kick in again after
+    // item selected from context menu.
+    if ( mCur == mNull && !gPopupMenuView->getVisible() )
+    {
+        LLSelectMgr::getInstance()->deselectAll();
+        setCurrentTool( (LLTool*) mGrab );
+    }
+
+    // Note: if the tool changed, we can't delegate the current mouse event
+    // after the change because tools can modify the mouse during selection and deselection.
+    // Instead we let the current tool handle the event and then make the change.
+    // The new tool will take effect on the next frame.
+
+    mCur->handleHover( x, y, mask );
+
+    // If mouse button not down...
+    if( !gViewerWindow->getLeftMouseDown())
+    {
+        // let ALT switch from gun to grab
+        if ( mCur == mGun && (mask & MASK_ALT) )
+        {
+            setCurrentTool( (LLTool*) mGrab );
+        }
+        else if ( mCur == mGrab && !(mask & MASK_ALT) )
+        {
+            setCurrentTool( (LLTool*) mGun );
+            setMouseCapture(true);
+        }
+    }
+
+    return true;
+}
+
+
+bool LLToolCompGun::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+    // if the left button is grabbed, don't put up the pie menu
+    if (gAgent.leftButtonGrabbed() && gViewerInput.isLMouseHandlingDefault(MODE_FIRST_PERSON))
+    {
+        gAgent.setControlFlags(AGENT_CONTROL_ML_LBUTTON_DOWN);
+        return false;
+    }
+
+    // On mousedown, start grabbing
+    gGrabTransientTool = this;
+    LLToolMgr::getInstance()->getCurrentToolset()->selectTool( (LLTool*) mGrab );
+
+    return LLToolGrab::getInstance()->handleMouseDown(x, y, mask);
+}
+
+
+bool LLToolCompGun::handleDoubleClick(S32 x, S32 y, MASK mask)
+{
+    // if the left button is grabbed, don't put up the pie menu
+    if (gAgent.leftButtonGrabbed() && gViewerInput.isLMouseHandlingDefault(MODE_FIRST_PERSON))
+    {
+        gAgent.setControlFlags(AGENT_CONTROL_ML_LBUTTON_DOWN);
+        return false;
+    }
+
+    // On mousedown, start grabbing
+    gGrabTransientTool = this;
+    LLToolMgr::getInstance()->getCurrentToolset()->selectTool( (LLTool*) mGrab );
+
+    return LLToolGrab::getInstance()->handleDoubleClick(x, y, mask);
+}
+
+
+bool LLToolCompGun::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+    /* JC - suppress context menu 8/29/2002
+
+    // On right mouse, go through some convoluted steps to
+    // make the build menu appear.
+    setCurrentTool( (LLTool*) mNull );
+
+    // This should return false, meaning the context menu will
+    // be shown.
+    return false;
+    */
+
+    // Returning true will suppress the context menu
+    return true;
+}
+
+
+bool LLToolCompGun::handleMouseUp(S32 x, S32 y, MASK mask)
+{
+    if (gViewerInput.isLMouseHandlingDefault(MODE_FIRST_PERSON))
+    {
+        gAgent.setControlFlags(AGENT_CONTROL_ML_LBUTTON_UP);
+    }
+    setCurrentTool( (LLTool*) mGun );
+    return true;
+}
+
+void LLToolCompGun::onMouseCaptureLost()
+{
+    if (mComposite)
+    {
+        mComposite->onMouseCaptureLost();
+        return;
+    }
+    mCur->onMouseCaptureLost();
+}
+
+void    LLToolCompGun::handleSelect()
+{
+    LLToolComposite::handleSelect();
+    setMouseCapture(true);
+}
+
+void    LLToolCompGun::handleDeselect()
+{
+    LLToolComposite::handleDeselect();
+    setMouseCapture(false);
+}
+
+
+bool LLToolCompGun::handleScrollWheel(S32 x, S32 y, S32 clicks)
+{
+    if (clicks > 0)
+    {
+        gAgentCamera.changeCameraToDefault();
+
+    }
+    return true;
+}