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.cpp | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/lltoolpipette.cpp')
| -rw-r--r-- | indra/newview/lltoolpipette.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/lltoolpipette.cpp b/indra/newview/lltoolpipette.cpp index aa9500fc0a..a565e4361b 100644 --- a/indra/newview/lltoolpipette.cpp +++ b/indra/newview/lltoolpipette.cpp @@ -51,8 +51,8 @@ // LLToolPipette::LLToolPipette() -: LLTool("Pipette"), -mSuccess(TRUE) +: LLTool(std::string("Pipette")), + mSuccess(TRUE) { mSelectCallback = NULL; mUserData = NULL; @@ -95,7 +95,7 @@ BOOL LLToolPipette::handleHover(S32 x, S32 y, MASK mask) return FALSE; } -BOOL LLToolPipette::handleToolTip(S32 x, S32 y, LLString& msg, LLRect *sticky_rect_screen) +BOOL LLToolPipette::handleToolTip(S32 x, S32 y, std::string& msg, LLRect *sticky_rect_screen) { if (mTooltipMsg.empty()) { @@ -133,7 +133,7 @@ void LLToolPipette::setSelectCallback(select_callback callback, void* user_data) mUserData = user_data; } -void LLToolPipette::setResult(BOOL success, const LLString& msg) +void LLToolPipette::setResult(BOOL success, const std::string& msg) { mTooltipMsg = msg; mSuccess = success; |