Second Life viewer sources 1.21.0-RC

1 files changed, 46 insertions, 46 deletions

diff --git a/linden/indra/newview/lltoolcomp.cpp b/linden/indra/newview/lltoolcomp.cpp
index f840a15..26f0bac 100644
--- a/linden/indra/newview/lltoolcomp.cpp
+++ b/linden/indra/newview/lltoolcomp.cpp
@@ -84,7 +84,7 @@ void LLToolComposite::setCurrentTool( LLTool* new_tool )
         }
 }
 
-LLToolComposite::LLToolComposite(const LLString& name)
+LLToolComposite::LLToolComposite(const std::string& name)
         : LLTool(name),
           mCur(NULL), mDefault(NULL), mSelected(FALSE),
           mMouseDown(FALSE), mManip(NULL), mSelectRect(NULL)
@@ -129,7 +129,7 @@ void LLToolComposite::handleSelect()
 //----------------------------------------------------------------------------
 
 LLToolCompInspect::LLToolCompInspect()
-: LLToolComposite("Inspect")
+: LLToolComposite(std::string("Inspect"))
 {
         mSelectRect             = new LLToolSelectRect(this);
         mDefault = mSelectRect;
@@ -145,18 +145,18 @@ LLToolCompInspect::~LLToolCompInspect()
 BOOL LLToolCompInspect::handleMouseDown(S32 x, S32 y, MASK mask)
 {
         mMouseDown = TRUE;
-        gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback);
+        gViewerWindow->pickAsync(x, y, mask, pickCallback);
         return TRUE;
 }
 
-void LLToolCompInspect::pickCallback(S32 x, S32 y, MASK mask)
+void LLToolCompInspect::pickCallback(const LLPickInfo& pick_info)
 {
-        LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
+        LLViewerObject* hit_obj = pick_info.getObject();
 
         if (!LLToolCompInspect::getInstance()->mMouseDown)
         {
                 // fast click on object, but mouse is already up...just do select
-                LLToolCompInspect::getInstance()->mSelectRect->handleObjectSelection(hit_obj, mask, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
+                LLToolCompInspect::getInstance()->mSelectRect->handleObjectSelection(pick_info, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
                 return;
         }
 
@@ -167,13 +167,13 @@ void LLToolCompInspect::pickCallback(S32 x, S32 y, MASK mask)
                         LLEditMenuHandler::gEditMenuHandler = LLSelectMgr::getInstance();
                 }
                 LLToolCompInspect::getInstance()->setCurrentTool( LLToolCompInspect::getInstance()->mSelectRect );
-                LLToolCompInspect::getInstance()->mSelectRect->handleMouseDown( x, y, mask );
+                LLToolCompInspect::getInstance()->mSelectRect->handlePick( pick_info );
 
         }
         else
         {
                 LLToolCompInspect::getInstance()->setCurrentTool( LLToolCompInspect::getInstance()->mSelectRect );
-                LLToolCompInspect::getInstance()->mSelectRect->handleMouseDown( x, y, mask);
+                LLToolCompInspect::getInstance()->mSelectRect->handlePick( pick_info );
         }
 }
 
@@ -187,7 +187,7 @@ BOOL LLToolCompInspect::handleDoubleClick(S32 x, S32 y, MASK mask)
 //----------------------------------------------------------------------------
 
 LLToolCompTranslate::LLToolCompTranslate()
-        : LLToolComposite("Move")
+        : LLToolComposite(std::string("Move"))
 {
         mManip          = new LLManipTranslate(this);
         mSelectRect             = new LLToolSelectRect(this);
@@ -218,19 +218,19 @@ BOOL LLToolCompTranslate::handleHover(S32 x, S32 y, MASK mask)
 BOOL LLToolCompTranslate::handleMouseDown(S32 x, S32 y, MASK mask)
 {
         mMouseDown = TRUE;
-        gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback, TRUE);
+        gViewerWindow->pickAsync(x, y, mask, pickCallback, TRUE);
         return TRUE;
 }
 
-void LLToolCompTranslate::pickCallback(S32 x, S32 y, MASK mask)
+void LLToolCompTranslate::pickCallback(const LLPickInfo& pick_info)
 {
-        LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
+        LLViewerObject* hit_obj = pick_info.getObject();
 
-        LLToolCompTranslate::getInstance()->mManip->highlightManipulators(x, y);
+        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(hit_obj, mask, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
+                LLToolCompTranslate::getInstance()->mSelectRect->handleObjectSelection(pick_info, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
                 return;
         }
 
@@ -246,12 +246,12 @@ void LLToolCompTranslate::pickCallback(S32 x, S32 y, MASK mask)
                 if(     LLManip::LL_NO_PART != LLToolCompTranslate::getInstance()->mManip->getHighlightedPart() && can_move)
                 {
                         LLToolCompTranslate::getInstance()->setCurrentTool( LLToolCompTranslate::getInstance()->mManip );
-                        LLToolCompTranslate::getInstance()->mManip->handleMouseDownOnPart( x, y, mask );
+                        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->handleMouseDown( x, y, mask );
+                        LLToolCompTranslate::getInstance()->mSelectRect->handlePick( pick_info );
 
                         // *TODO: add toggle to trigger old click-drag functionality
                         // LLToolCompTranslate::getInstance()->mManip->handleMouseDownOnPart( XY_part, x, y, mask);
@@ -260,7 +260,7 @@ void LLToolCompTranslate::pickCallback(S32 x, S32 y, MASK mask)
         else
         {
                 LLToolCompTranslate::getInstance()->setCurrentTool( LLToolCompTranslate::getInstance()->mSelectRect );
-                LLToolCompTranslate::getInstance()->mSelectRect->handleMouseDown( x, y, mask);
+                LLToolCompTranslate::getInstance()->mSelectRect->handlePick( pick_info );
         }
 }
 
@@ -314,7 +314,7 @@ void LLToolCompTranslate::render()
 // LLToolCompScale
 
 LLToolCompScale::LLToolCompScale()
-        : LLToolComposite("Stretch")
+        : LLToolComposite(std::string("Stretch"))
 {
         mManip = new LLManipScale(this);
         mSelectRect = new LLToolSelectRect(this);
@@ -342,19 +342,19 @@ BOOL LLToolCompScale::handleHover(S32 x, S32 y, MASK mask)
 BOOL LLToolCompScale::handleMouseDown(S32 x, S32 y, MASK mask)
 {
         mMouseDown = TRUE;
-        gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback);
+        gViewerWindow->pickAsync(x, y, mask, pickCallback);
         return TRUE;
 }
 
-void LLToolCompScale::pickCallback(S32 x, S32 y, MASK mask)
+void LLToolCompScale::pickCallback(const LLPickInfo& pick_info)
 {
-        LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
+        LLViewerObject* hit_obj = pick_info.getObject();
 
-        LLToolCompScale::getInstance()->mManip->highlightManipulators(x, y);
+        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(hit_obj, mask, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
+                LLToolCompScale::getInstance()->mSelectRect->handleObjectSelection(pick_info, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
 
                 return;
         }
@@ -368,18 +368,18 @@ void LLToolCompScale::pickCallback(S32 x, S32 y, MASK mask)
                 if(     LLManip::LL_NO_PART != LLToolCompScale::getInstance()->mManip->getHighlightedPart() )
                 {
                         LLToolCompScale::getInstance()->setCurrentTool( LLToolCompScale::getInstance()->mManip );
-                        LLToolCompScale::getInstance()->mManip->handleMouseDownOnPart( x, y, mask );
+                        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->handleMouseDown( x, y, mask );
+                        LLToolCompScale::getInstance()->mSelectRect->handlePick( pick_info );
                 }
         }
         else
         {
                 LLToolCompScale::getInstance()->setCurrentTool( LLToolCompScale::getInstance()->mSelectRect );
-                LLToolCompScale::getInstance()->mCur->handleMouseDown( x, y, mask );
+                LLToolCompScale::getInstance()->mSelectRect->handlePick( pick_info );
         }
 }
 
@@ -434,7 +434,7 @@ void LLToolCompScale::render()
 // LLToolCompCreate
 
 LLToolCompCreate::LLToolCompCreate()
-        : LLToolComposite("Create")
+        : LLToolComposite(std::string("Create"))
 {
         mPlacer = new LLToolPlacer();
         mSelectRect = new LLToolSelectRect(this);
@@ -457,15 +457,15 @@ BOOL LLToolCompCreate::handleMouseDown(S32 x, S32 y, MASK mask)
         BOOL handled = FALSE;
         mMouseDown = TRUE;
 
-        if ( !(mask == MASK_SHIFT) && !(mask == MASK_CONTROL) )
+        if ( (mask == MASK_SHIFT) || (mask == MASK_CONTROL) )
         {
-                setCurrentTool( mPlacer );
-                handled = mPlacer->placeObject( x, y, mask );
+                gViewerWindow->pickAsync(x, y, mask, pickCallback);
+                handled = TRUE;
         }
         else
         {
-                gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback);
-                handled = TRUE;
+                setCurrentTool( mPlacer );
+                handled = mPlacer->placeObject( x, y, mask );
         }
         
         mObjectPlacedOnMouseDown = TRUE;
@@ -473,15 +473,15 @@ BOOL LLToolCompCreate::handleMouseDown(S32 x, S32 y, MASK mask)
         return TRUE;
 }
 
-void LLToolCompCreate::pickCallback(S32 x, S32 y, MASK mask)
+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 & ~MASK_SHIFT);
+        MASK mask = (pick_info.mKeyMask & ~MASK_SHIFT);
         mask = (mask & ~MASK_CONTROL);
 
         LLToolCompCreate::getInstance()->setCurrentTool( LLToolCompCreate::getInstance()->mSelectRect );
-        LLToolCompCreate::getInstance()->mSelectRect->handleMouseDown( x, y, mask);
+        LLToolCompCreate::getInstance()->mSelectRect->handlePick( pick_info );
 }
 
 BOOL LLToolCompCreate::handleDoubleClick(S32 x, S32 y, MASK mask)
@@ -514,7 +514,7 @@ BOOL LLToolCompCreate::handleMouseUp(S32 x, S32 y, MASK mask)
 // LLToolCompRotate
 
 LLToolCompRotate::LLToolCompRotate()
-        : LLToolComposite("Rotate")
+        : LLToolComposite(std::string("Rotate"))
 {
         mManip = new LLManipRotate(this);
         mSelectRect = new LLToolSelectRect(this);
@@ -543,19 +543,19 @@ BOOL LLToolCompRotate::handleHover(S32 x, S32 y, MASK mask)
 BOOL LLToolCompRotate::handleMouseDown(S32 x, S32 y, MASK mask)
 {
         mMouseDown = TRUE;
-        gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback);
+        gViewerWindow->pickAsync(x, y, mask, pickCallback);
         return TRUE;
 }
 
-void LLToolCompRotate::pickCallback(S32 x, S32 y, MASK mask)
+void LLToolCompRotate::pickCallback(const LLPickInfo& pick_info)
 {
-        LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
+        LLViewerObject* hit_obj = pick_info.getObject();
 
-        LLToolCompRotate::getInstance()->mManip->highlightManipulators(x, y);
+        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(hit_obj, mask, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
+                LLToolCompRotate::getInstance()->mSelectRect->handleObjectSelection(pick_info, gSavedSettings.getBOOL("EditLinkedParts"), FALSE);
                 return;
         }
         
@@ -568,18 +568,18 @@ void LLToolCompRotate::pickCallback(S32 x, S32 y, MASK mask)
                 if(     LLManip::LL_NO_PART != LLToolCompRotate::getInstance()->mManip->getHighlightedPart() )
                 {
                         LLToolCompRotate::getInstance()->setCurrentTool( LLToolCompRotate::getInstance()->mManip );
-                        LLToolCompRotate::getInstance()->mManip->handleMouseDownOnPart( x, y, mask );
+                        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->handleMouseDown( x, y, mask );
+                        LLToolCompRotate::getInstance()->mSelectRect->handlePick( pick_info );
                 }
         }
         else
         {
                 LLToolCompRotate::getInstance()->setCurrentTool( LLToolCompRotate::getInstance()->mSelectRect );
-                LLToolCompRotate::getInstance()->mCur->handleMouseDown( x, y, mask );
+                LLToolCompRotate::getInstance()->mSelectRect->handlePick( pick_info );
         }
 }
 
@@ -633,11 +633,11 @@ void LLToolCompRotate::render()
 // LLToolCompGun
 
 LLToolCompGun::LLToolCompGun()
-        : LLToolComposite("Mouselook")
+        : LLToolComposite(std::string("Mouselook"))
 {
         mGun = new LLToolGun(this);
         mGrab = new LLToolGrab(this);
-        mNull = new LLTool("null", this);
+        mNull = new LLTool(std::string("null"), this);
 
         setCurrentTool(mGun);
         mDefault = mGun;