Second Life viewer sources 1.21.0-RC

1 files changed, 6 insertions, 11 deletions

diff --git a/linden/indra/newview/lltoolobjpicker.cpp b/linden/indra/newview/lltoolobjpicker.cpp
index f5d25d8..401c6c6 100644
--- a/linden/indra/newview/lltoolobjpicker.cpp
+++ b/linden/indra/newview/lltoolobjpicker.cpp
@@ -50,7 +50,7 @@
 
 
 LLToolObjPicker::LLToolObjPicker()
-:       LLTool( "ObjPicker", NULL ),
+:       LLTool( std::string("ObjPicker"), NULL ),
         mPicked( FALSE ),
         mHitObjectID( LLUUID::null ),
         mExitCallback( NULL ),
@@ -69,7 +69,7 @@ BOOL LLToolObjPicker::handleMouseDown(S32 x, S32 y, MASK mask)
         if (! handled)
         {
                 // didn't click in any UI object, so must have clicked in the world
-                gViewerWindow->hitObjectOrLandGlobalAsync(x, y, mask, pickCallback);
+                gViewerWindow->pickAsync(x, y, mask, pickCallback);
                 handled = TRUE;
         }
         else
@@ -90,16 +90,10 @@ BOOL LLToolObjPicker::handleMouseDown(S32 x, S32 y, MASK mask)
         return handled;
 }
 
-void LLToolObjPicker::pickCallback(S32 x, S32 y, MASK mask)
+void LLToolObjPicker::pickCallback(const LLPickInfo& pick_info)
 {
-        // You must hit the body for this tool to think you hit the object.
-        LLViewerObject* objectp = NULL;
-        objectp = gObjectList.findObject( gLastHitObjectID );
-        if (objectp)
-        {
-                LLToolObjPicker::getInstance()->mHitObjectID = objectp->mID;
-                LLToolObjPicker::getInstance()->mPicked = TRUE;
-        }
+        LLToolObjPicker::getInstance()->mHitObjectID = pick_info.mObjectID;
+        LLToolObjPicker::getInstance()->mPicked = pick_info.mObjectID.notNull();
 }
 
 
@@ -181,3 +175,4 @@ void LLToolObjPicker::handleDeselect()
 }
 
 
+