Second Life viewer sources 1.21.0-RC

1 files changed, 5 insertions, 4 deletions

diff --git a/linden/indra/newview/lltoolpipette.h b/linden/indra/newview/lltoolpipette.h
index 28d0393..bb50f49 100644
--- a/linden/indra/newview/lltoolpipette.h
+++ b/linden/indra/newview/lltoolpipette.h
@@ -41,6 +41,7 @@
 #include "lltextureentry.h"
 
 class LLViewerObject;
+class LLPickInfo;
 
 class LLToolPipette
 :       public LLTool, public LLSingleton<LLToolPipette>
@@ -52,19 +53,19 @@ public:
         virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
         virtual BOOL    handleMouseUp(S32 x, S32 y, MASK mask);
         virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
-        virtual BOOL    handleToolTip(S32 x, S32 y, LLString& msg, LLRect *sticky_rect_screen);
+        virtual BOOL    handleToolTip(S32 x, S32 y, std::string& msg, LLRect *sticky_rect_screen);
 
         typedef void (*select_callback)(const LLTextureEntry& te, void *data);
         void setSelectCallback(select_callback callback, void* user_data);
-        void setResult(BOOL success, const LLString& msg);
+        void setResult(BOOL success, const std::string& msg);
 
-        static void pickCallback(S32 x, S32 y, MASK mask);
+        static void pickCallback(const LLPickInfo& pick_info);
 
 protected:
         LLTextureEntry  mTextureEntry;
         select_callback mSelectCallback;
         BOOL                    mSuccess;
-        LLString                mTooltipMsg;
+        std::string             mTooltipMsg;
         void*                   mUserData;
 };