diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/lltoolpipette.h | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/lltoolpipette.h')
| -rw-r--r-- | indra/newview/lltoolpipette.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lltoolpipette.h b/indra/newview/lltoolpipette.h index ef4718bd62..b88a6eebc8 100644 --- a/indra/newview/lltoolpipette.h +++ b/indra/newview/lltoolpipette.h @@ -52,11 +52,11 @@ 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); @@ -64,7 +64,7 @@ protected: LLTextureEntry mTextureEntry; select_callback mSelectCallback; BOOL mSuccess; - LLString mTooltipMsg; + std::string mTooltipMsg; void* mUserData; }; |