1 files changed, 74 insertions, 76 deletions

diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 4bb2111..de10045 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -67,10 +67,6 @@
 #include "llui.h"
 #include "llweb.h"
 
-LLPointer<LLViewerObject> LLToolPie::sClickActionObject;
-LLSafeHandle<LLObjectSelection> LLToolPie::sLeftClickSelection = NULL;
-U8 LLToolPie::sClickAction = 0;
-
 extern void handle_buy(void*);
 
 extern BOOL gDebugClicks;
@@ -81,53 +77,52 @@ static ECursorType cursor_from_parcel_media(U8 click_action);
 
 
 LLToolPie::LLToolPie()
-:       LLTool("Select"),
+:       LLTool(std::string("Select")),
         mPieMouseButtonDown( FALSE ),
         mGrabMouseButtonDown( FALSE ),
-        mHitLand( FALSE ),
-        mHitObjectID(),
-        mMouseOutsideSlop( FALSE )
+        mMouseOutsideSlop( FALSE ),
+        mClickAction(0)
 { }
 
 
 BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-        gPickFaces = TRUE;
         //left mouse down always picks transparent
-        gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, leftMouseCallback, 
-                                                                                          TRUE, TRUE);
+        gViewerWindow->pickAsync(x, y, mask, leftMouseCallback, TRUE, TRUE);
         mGrabMouseButtonDown = TRUE;
         return TRUE;
 }
 
 // static
-void LLToolPie::leftMouseCallback(S32 x, S32 y, MASK mask)
+void LLToolPie::leftMouseCallback(const LLPickInfo& pick_info)
 {
-        LLToolPie::getInstance()->pickAndShowMenu(x, y, mask, FALSE);
+        LLToolPie::getInstance()->mPick = pick_info;
+        LLToolPie::getInstance()->pickAndShowMenu(FALSE);
 }
 
 BOOL LLToolPie::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
-        // Pick faces in case they select "Copy Texture" and need that info.
-        gPickFaces = TRUE;
         // don't pick transparent so users can't "pay" transparent objects
-        gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, rightMouseCallback,
-                                                                                          FALSE, TRUE);
+        gViewerWindow->pickAsync(x, y, mask, rightMouseCallback, FALSE, TRUE);
         mPieMouseButtonDown = TRUE; 
         // don't steal focus from UI
         return FALSE;
 }
 
 // static
-void LLToolPie::rightMouseCallback(S32 x, S32 y, MASK mask)
+void LLToolPie::rightMouseCallback(const LLPickInfo& pick_info)
 {
-        LLToolPie::getInstance()->pickAndShowMenu(x, y, mask, TRUE);
+        LLToolPie::getInstance()->mPick = pick_info;
+        LLToolPie::getInstance()->pickAndShowMenu(TRUE);
 }
 
 // True if you selected an object.
-BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
+BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
 {
-        if (!always_show && gLastHitParcelWall)
+        S32 x = mPick.mMousePt.mX;
+        S32 y = mPick.mMousePt.mY;
+        MASK mask = mPick.mKeyMask;
+        if (!always_show && mPick.mPickType == LLPickInfo::PICK_PARCEL_WALL)
         {
                 LLParcel* parcel = LLViewerParcelMgr::getInstance()->getCollisionParcel();
                 if (parcel)
@@ -151,25 +146,18 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
         }
 
         // didn't click in any UI object, so must have clicked in the world
-        LLViewerObject *object = gViewerWindow->lastObjectHit();
+        LLViewerObject *object = mPick.getObject();
         LLViewerObject *parent = NULL;
 
-        mHitLand = !object && !gLastHitPosGlobal.isExactlyZero();
-        if (!mHitLand)
+        if (mPick.mPickType != LLPickInfo::PICK_LAND)
         {
                 LLViewerParcelMgr::getInstance()->deselectLand();
         }
         
         if (object)
         {
-                mHitObjectID = object->mID;
-
                 parent = object->getRootEdit();
         }
-        else
-        {
-                mHitObjectID.setNull();
-        }
 
         BOOL touchable = (object && object->flagHandleTouch()) 
                                          || (parent && parent->flagHandleTouch());
@@ -177,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))
         {
-                sClickAction = 0;
+                mClickAction = 0;
                 if (object && object->getClickAction()) 
                 {
-                        sClickAction = object->getClickAction();
+                        mClickAction = object->getClickAction();
                 }
                 else if (parent && parent->getClickAction()) 
                 {
-                        sClickAction = parent->getClickAction();
+                        mClickAction = parent->getClickAction();
                 }
 
-                switch(sClickAction)
+                switch(mClickAction)
                 {
                 case CLICK_ACTION_TOUCH:
                 default:
@@ -205,27 +193,27 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
                                 || parent && parent->flagTakesMoney())
                         {
                                 // pay event goes to object actually clicked on
-                                sClickActionObject = object;
-                                sLeftClickSelection = LLToolSelect::handleObjectSelection(object, MASK_NONE, FALSE, TRUE);
+                                mClickActionObject = object;
+                                mLeftClickSelection = LLToolSelect::handleObjectSelection(mPick, FALSE, TRUE);
                                 return TRUE;
                         }
                         break;
                 case CLICK_ACTION_BUY:
-                        sClickActionObject = parent;
-                        sLeftClickSelection = LLToolSelect::handleObjectSelection(parent, MASK_NONE, FALSE, TRUE);
+                        mClickActionObject = parent;
+                        mLeftClickSelection = LLToolSelect::handleObjectSelection(mPick, FALSE, TRUE, TRUE);
                         return TRUE;
                 case CLICK_ACTION_OPEN:
                         if (parent && parent->allowOpen())
                         {
-                                sClickActionObject = parent;
-                                sLeftClickSelection = LLToolSelect::handleObjectSelection(parent, MASK_NONE, FALSE, TRUE);
+                                mClickActionObject = parent;
+                                mLeftClickSelection = LLToolSelect::handleObjectSelection(mPick, FALSE, TRUE, TRUE);
                         }
                         return TRUE;
                 case CLICK_ACTION_PLAY:
                         handle_click_action_play();
                         return TRUE;
                 case CLICK_ACTION_OPEN_MEDIA:
-                        // sClickActionObject = object;
+                        // mClickActionObject = object;
                         handle_click_action_open_media(object);
                         return TRUE;
                 }
@@ -239,12 +227,13 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
         {
                 gGrabTransientTool = this;
                 LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolGrab::getInstance() );
-                return LLToolGrab::getInstance()->handleObjectHit( object, x, y, mask);
+                return LLToolGrab::getInstance()->handleObjectHit( mPick );
         }
         
-        if (!object && gLastHitHUDIcon && gLastHitHUDIcon->getSourceObject())
+        LLHUDIcon* last_hit_hud_icon = mPick.mHUDIcon;
+        if (!object && last_hit_hud_icon && last_hit_hud_icon->getSourceObject())
         {
-                LLFloaterScriptDebug::show(gLastHitHUDIcon->getSourceObject()->getID());
+                LLFloaterScriptDebug::show(last_hit_hud_icon->getSourceObject()->getID());
         }
 
         // If left-click never selects or spawns a menu
@@ -273,7 +262,7 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
                         LLToolMgr::getInstance()->setTransientTool(LLToolCamera::getInstance());
                         gViewerWindow->hideCursor();
                         LLToolCamera::getInstance()->setMouseCapture(TRUE);
-                        LLToolCamera::getInstance()->pickCallback(gViewerWindow->getCurrentMouseX(), gViewerWindow->getCurrentMouseY(), mask);
+                        LLToolCamera::getInstance()->pickCallback(mPick);
                         gAgent.setFocusOnAvatar(TRUE, TRUE);
 
                         return TRUE;
@@ -292,22 +281,22 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
         }
 
         // Can't ignore children here.
-        LLToolSelect::handleObjectSelection(object, mask, FALSE, TRUE);
+        LLToolSelect::handleObjectSelection(mPick, FALSE, TRUE);
 
         // Spawn pie menu
-        if (mHitLand)
+        if (mPick.mPickType == LLPickInfo::PICK_LAND)
         {
-                LLParcelSelectionHandle selection = LLViewerParcelMgr::getInstance()->selectParcelAt( gLastHitPosGlobal );
+                LLParcelSelectionHandle selection = LLViewerParcelMgr::getInstance()->selectParcelAt( mPick.mPosGlobal );
                 gMenuHolder->setParcelSelection(selection);
                 gPieLand->show(x, y, mPieMouseButtonDown);
 
                 // VEFFECT: ShowPie
                 LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_SPHERE, TRUE);
-                effectp->setPositionGlobal(gLastHitPosGlobal);
+                effectp->setPositionGlobal(mPick.mPosGlobal);
                 effectp->setColor(LLColor4U(gAgent.getEffectColor()));
                 effectp->setDuration(0.25f);
         }
-        else if (mHitObjectID == gAgent.getID() )
+        else if (mPick.mObjectID == gAgent.getID() )
         {
                 if(!gPieSelf) 
                 {
@@ -333,15 +322,15 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
 
                         // Object is an avatar, so check for mute by id.
                         LLVOAvatar* avatar = (LLVOAvatar*)object;
-                        LLString name = avatar->getFullname();
+                        std::string name = avatar->getFullname();
                         if (LLMuteList::getInstance()->isMuted(avatar->getID(), name))
                         {
-                                gMenuHolder->childSetText("Avatar Mute", LLString("Unmute")); // *TODO:Translate
+                                gMenuHolder->childSetText("Avatar Mute", std::string("Unmute")); // *TODO:Translate
                                 //gMutePieMenu->setLabel("Unmute");
                         }
                         else
                         {
-                                gMenuHolder->childSetText("Avatar Mute", LLString("Mute")); // *TODO:Translate
+                                gMenuHolder->childSetText("Avatar Mute", std::string("Mute")); // *TODO:Translate
                                 //gMutePieMenu->setLabel("Mute");
                         }
 
@@ -354,7 +343,7 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
                 else
                 {
                         // BUG: What about chatting child objects?
-                        LLString name;
+                        std::string name;
                         LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
                         if (node)
                         {
@@ -362,12 +351,12 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
                         }
                         if (LLMuteList::getInstance()->isMuted(object->getID(), name))
                         {
-                                gMenuHolder->childSetText("Object Mute", LLString("Unmute")); // *TODO:Translate
+                                gMenuHolder->childSetText("Object Mute", std::string("Unmute")); // *TODO:Translate
                                 //gMuteObjectPieMenu->setLabel("Unmute");
                         }
                         else
                         {
-                                gMenuHolder->childSetText("Object Mute", LLString("Mute")); // *TODO:Translate
+                                gMenuHolder->childSetText("Object Mute", std::string("Mute")); // *TODO:Translate
                                 //gMuteObjectPieMenu->setLabel("Mute");
                         }
                         
@@ -377,7 +366,7 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show)
                         // Don't show when you click on someone else, it freaks them
                         // out.
                         LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_SPHERE, TRUE);
-                        effectp->setPositionGlobal(gLastHitPosGlobal);
+                        effectp->setPositionGlobal(mPick.mPosGlobal);
                         effectp->setColor(LLColor4U(gAgent.getEffectColor()));
                         effectp->setDuration(0.25f);
                 }
@@ -479,8 +468,16 @@ ECursorType cursor_from_object(LLViewerObject* object)
         return cursor;
 }
 
+void LLToolPie::resetSelection()
+{
+        mLeftClickSelection = NULL;
+        mClickActionObject = NULL;
+        mClickAction = 0;
+}
+
 // When we get object properties after left-clicking on an object
 // with left-click = buy, if it's the same object, do the buy.
+
 // static
 void LLToolPie::selectionPropertiesReceived()
 {
@@ -491,14 +488,16 @@ void LLToolPie::selectionPropertiesReceived()
                 return;
         }
 
-        if (!sLeftClickSelection->isEmpty())
+        LLObjectSelection* selection = LLToolPie::getInstance()->getLeftClickSelection();
+        if (selection)
         {
-                LLViewerObject* selected_object = sLeftClickSelection->getPrimaryObject();
+                LLViewerObject* selected_object = selection->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 (selected_object == sClickActionObject)
+                if (selected_object == LLToolPie::getInstance()->getClickActionObject())
                 {
-                        switch (sClickAction)
+                        U8 click_action = LLToolPie::getInstance()->getClickAction();
+                        switch (click_action)
                         {
                         case CLICK_ACTION_BUY:
                                 handle_buy(NULL);
@@ -514,9 +513,7 @@ void LLToolPie::selectionPropertiesReceived()
                         }
                 }
         }
-        sLeftClickSelection = NULL;
-        sClickActionObject = NULL;
-        sClickAction = 0;
+        LLToolPie::getInstance()->resetSelection();
 }
 
 BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
@@ -544,7 +541,7 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
         LLViewerObject *parent = NULL;
         if (gHoverView)
         {
-                object = gHoverView->getLastHoverObject();
+                object = gViewerWindow->getHoverPick().getObject();
         }
 
         if (object)
@@ -581,7 +578,7 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
 
 BOOL LLToolPie::handleMouseUp(S32 x, S32 y, MASK mask)
 {
-        LLViewerObject* obj = gViewerWindow->lastObjectHit();
+        LLViewerObject* obj = mPick.getObject();
         U8 click_action = final_click_action(obj);
         if (click_action != CLICK_ACTION_NONE)
         {
@@ -626,18 +623,18 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
 
         if (gSavedSettings.getBOOL("DoubleClickAutoPilot"))
         {
-                if (gLastHitLand
-                        && !gLastHitPosGlobal.isExactlyZero())
+                if (mPick.mPickType == LLPickInfo::PICK_LAND
+                        && !mPick.mPosGlobal.isExactlyZero())
                 {
                         handle_go_to();
                         return TRUE;
                 }
-                else if (gLastHitObjectID.notNull()
-                                 && !gLastHitPosGlobal.isExactlyZero())
+                else if (mPick.mObjectID.notNull()
+                                 && !mPick.mPosGlobal.isExactlyZero())
                 {
                         // Hit an object
                         // HACK: Call the last hit position the point we hit on the object
-                        gLastHitPosGlobal += gLastHitObjectOffset;
+                        //gLastHitPosGlobal += gLastHitObjectOffset;
                         handle_go_to();
                         return TRUE;
                 }
@@ -649,7 +646,7 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
         objects gets you into trouble.
 
         // If double-click on object or land, go there.
-        LLViewerObject *object = gViewerWindow->lastObjectHit();
+        LLViewerObject *object = gViewerWindow->getLastPick().getObject();
         if (object)
         {
                 if (object->isAvatar())
@@ -756,10 +753,11 @@ static void handle_click_action_open_media(LLPointer<LLViewerObject> objectp)
         if (objectp.isNull()) return;
 
         // did we hit a valid face on the object?
-        if( gLastHitObjectFace < 0 || gLastHitObjectFace >= objectp->getNumTEs() ) return;
+        S32 face = LLToolPie::getInstance()->getPick().mObjectFace;
+        if( face < 0 || face >= objectp->getNumTEs() ) return;
                 
         // is media playing on this face?
-        if (!LLViewerMedia::isActiveMediaTexture(objectp->getTE(gLastHitObjectFace)->getID()))
+        if (!LLViewerMedia::isActiveMediaTexture(objectp->getTE(face)->getID()))
         {
                 handle_click_action_play();
                 return;
@@ -767,7 +765,7 @@ static void handle_click_action_open_media(LLPointer<LLViewerObject> objectp)
 
         std::string media_url = std::string ( parcel->getMediaURL () );
         std::string media_type = std::string ( parcel->getMediaType() );
-        LLString::trim(media_url);
+        LLStringUtil::trim(media_url);
 
         // Get the scheme, see if that is handled as well.
         LLURI uri(media_url);
@@ -796,7 +794,7 @@ static ECursorType cursor_from_parcel_media(U8 click_action)
 
         std::string media_url = std::string ( parcel->getMediaURL () );
         std::string media_type = std::string ( parcel->getMediaType() );
-        LLString::trim(media_url);
+        LLStringUtil::trim(media_url);
 
         // Get the scheme, see if that is handled as well.
         LLURI uri(media_url);