1 files changed, 29 insertions, 12 deletions

diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index e4be8ce..3eaa275 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -62,6 +62,7 @@
 LLToolPie *gToolPie = NULL;
 
 LLViewerObject* LLToolPie::sClickActionObject = NULL;
+LLHandle<LLObjectSelection> LLToolPie::sLeftClickSelection = NULL;
 
 extern void handle_buy(void*);
 
@@ -79,8 +80,7 @@ LLToolPie::LLToolPie()
 
 BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-        // if buttons swapped, don't pick transparent so users can't "pay" 
-        // transparent objects
+        //left mouse down always picks transparent
         gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, leftMouseCallback, 
                                                                                           TRUE, TRUE);
         mGrabMouseButtonDown = TRUE;
@@ -188,19 +188,19 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
                                 || parent && parent->flagTakesMoney())
                         {
                                 sClickActionObject = parent;
-                                LLToolSelect::handleObjectSelection(parent, MASK_NONE, FALSE, TRUE);
+                                sLeftClickSelection = LLToolSelect::handleObjectSelection(parent, MASK_NONE, FALSE, TRUE);
                                 return TRUE;
                         }
                         break;
                 case CLICK_ACTION_BUY:
                         sClickActionObject = parent;
-                        LLToolSelect::handleObjectSelection(parent, MASK_NONE, FALSE, TRUE);
+                        sLeftClickSelection = LLToolSelect::handleObjectSelection(parent, MASK_NONE, FALSE, TRUE);
                         return TRUE;
                 case CLICK_ACTION_OPEN:
                         if (parent && parent->allowOpen())
                         {
                                 sClickActionObject = parent;
-                                LLToolSelect::handleObjectSelection(parent, MASK_NONE, FALSE, TRUE);
+                                sLeftClickSelection = LLToolSelect::handleObjectSelection(parent, MASK_NONE, FALSE, TRUE);
                         }
                         return TRUE;
                 }
@@ -213,7 +213,7 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
                 !always_show)
         {
                 gGrabTransientTool = this;
-                gCurrentToolset->selectTool( gToolGrab );
+                gToolMgr->getCurrentToolset()->selectTool( gToolGrab );
                 return gToolGrab->handleObjectHit( object, x, y, mask);
         }
         
@@ -272,8 +272,8 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
         // Spawn pie menu
         if (mHitLand)
         {
-                gParcelMgr->selectParcelAt( gLastHitPosGlobal );
-
+                LLParcelSelectionHandle selection = gParcelMgr->selectParcelAt( gLastHitPosGlobal );
+                gMenuHolder->setParcelSelection(selection);
                 gPieLand->show(x, y, mPieMouseButtonDown);
 
                 // VEFFECT: ShowPie
@@ -288,6 +288,8 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
         }
         else if (object)
         {
+                gMenuHolder->setObjectSelection(gSelectMgr->getSelection());
+
                 if (object->isAvatar() 
                         || (object->isAttachment() && !object->isHUDAttachment() && !object->permYouOwner()))
                 {
@@ -321,7 +323,7 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
                 {
                         // BUG: What about chatting child objects?
                         LLString name;
-                        LLSelectNode* node = gSelectMgr->getFirstRootNode();
+                        LLSelectNode* node = gSelectMgr->getSelection()->getFirstRootNode();
                         if (node)
                         {
                                 name = node->mName;
@@ -413,10 +415,11 @@ void LLToolPie::selectionPropertiesReceived()
                 return;
         }
 
-        if (sClickActionObject
-                && !sClickActionObject->isDead())
+        if (!sLeftClickSelection->isEmpty())
         {
-                LLViewerObject* root = gSelectMgr->getFirstRootObject();
+                LLViewerObject* root = sLeftClickSelection->getFirstRootObject();
+                // since we don't currently have a way to lock a selection, it could have changed
+                // after we initially clicked on the object
                 if (root == sClickActionObject)
                 {
                         U8 action = root->getClickAction();
@@ -436,6 +439,7 @@ void LLToolPie::selectionPropertiesReceived()
                         }
                 }
         }
+        sLeftClickSelection = NULL;
         sClickActionObject = NULL;
 }
 
@@ -622,6 +626,19 @@ void LLToolPie::handleDeselect()
         gSelectMgr->validateSelection();
 }
 
+LLTool* LLToolPie::getOverrideTool(MASK mask)
+{
+        if (mask == MASK_CONTROL)
+        {
+                return gToolGrab;
+        }
+        else if (mask == (MASK_CONTROL | MASK_SHIFT))
+        {
+                return gToolGrab;
+        }
+
+        return LLTool::getOverrideTool(mask);
+}
 
 void LLToolPie::stopEditing()
 {