1 files changed, 12 insertions, 10 deletions

diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 3eaa275..4b29303 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -63,6 +63,7 @@ LLToolPie *gToolPie = NULL;
 
 LLViewerObject* LLToolPie::sClickActionObject = NULL;
 LLHandle<LLObjectSelection> LLToolPie::sLeftClickSelection = NULL;
+U8 LLToolPie::sClickAction = 0;
 
 extern void handle_buy(void*);
 
@@ -164,17 +165,17 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
         // If it's a left-click, and we have a special action, do it.
         if (useClickAction(always_show, mask, object, parent))
         {
-                U8 click_action = 0;
+                sClickAction = 0;
                 if (object && object->getClickAction()) 
                 {
-                        click_action = object->getClickAction();
+                        sClickAction = object->getClickAction();
                 }
                 else if (parent && parent->getClickAction()) 
                 {
-                        click_action = parent->getClickAction();
+                        sClickAction = parent->getClickAction();
                 }
 
-                switch(click_action)
+                switch(sClickAction)
                 {
                 case CLICK_ACTION_TOUCH:
                 default:
@@ -187,8 +188,9 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
                         if (object && object->flagTakesMoney()
                                 || parent && parent->flagTakesMoney())
                         {
-                                sClickActionObject = parent;
-                                sLeftClickSelection = LLToolSelect::handleObjectSelection(parent, MASK_NONE, FALSE, TRUE);
+                                // pay event goes to object actually clicked on
+                                sClickActionObject = object;
+                                sLeftClickSelection = LLToolSelect::handleObjectSelection(object, MASK_NONE, FALSE, TRUE);
                                 return TRUE;
                         }
                         break;
@@ -417,13 +419,12 @@ void LLToolPie::selectionPropertiesReceived()
 
         if (!sLeftClickSelection->isEmpty())
         {
-                LLViewerObject* root = sLeftClickSelection->getFirstRootObject();
+                LLViewerObject* selected_object = sLeftClickSelection->getPrimaryObject();
                 // 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)
+                if (selected_object == sClickActionObject)
                 {
-                        U8 action = root->getClickAction();
-                        switch (action)
+                        switch (sClickAction)
                         {
                         case CLICK_ACTION_BUY:
                                 handle_buy(NULL);
@@ -441,6 +442,7 @@ void LLToolPie::selectionPropertiesReceived()
         }
         sLeftClickSelection = NULL;
         sClickActionObject = NULL;
+        sClickAction = 0;
 }
 
 BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)