Merge tag 'Second_Life_Release#663bf4d3-26.3' into 26.3

1 files changed, 7 insertions, 14 deletions

diff --git a/indra/newview/lltoolpipette.cpp b/indra/newview/lltoolpipette.cpp
index 9e3d435688..6ec25e9512 100644
--- a/indra/newview/lltoolpipette.cpp
+++ b/indra/newview/lltoolpipette.cpp
@@ -47,8 +47,8 @@
 //
 
 LLToolPipette::LLToolPipette()
-:   LLTool(std::string("Pipette")),
-    mSuccess(true)
+:   LLTool(std::string("Pipette"))
+,   mSuccess(true)
 {
 }
 
@@ -103,15 +103,6 @@ bool LLToolPipette::handleToolTip(S32 x, S32 y, MASK mask)
     return true;
 }
 
-void LLToolPipette::setTextureEntry(const LLTextureEntry* entry)
-{
-    if (entry)
-    {
-        mTextureEntry = *entry;
-        mSignal(mTextureEntry);
-    }
-}
-
 void LLToolPipette::pickCallback(const LLPickInfo& pick_info)
 {
     LLViewerObject* hit_obj = pick_info.getObject();
@@ -120,12 +111,14 @@ void LLToolPipette::pickCallback(const LLPickInfo& pick_info)
     // if we clicked on a face of a valid prim, save off texture entry data
     if (hit_obj &&
         hit_obj->getPCode() == LL_PCODE_VOLUME &&
-        pick_info.mObjectFace != -1)
+        pick_info.mObjectFace != -1 &&
+        hit_obj->getNumTEs() > pick_info.mObjectFace)
     {
         //TODO: this should highlight the selected face only
         LLSelectMgr::getInstance()->highlightObjectOnly(hit_obj);
-        const LLTextureEntry* entry = hit_obj->getTE(pick_info.mObjectFace);
-        LLToolPipette::getInstance()->setTextureEntry(entry);
+
+        LLPointer<LLViewerObject> hit_obj_ptr = hit_obj;
+        LLToolPipette::getInstance()->mSignal(hit_obj_ptr, pick_info.mObjectFace);
     }
 }