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/lltool.cpp | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/lltool.cpp')
| -rw-r--r-- | indra/newview/lltool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/lltool.cpp b/indra/newview/lltool.cpp index 0398b7a0c1..22690b550a 100644 --- a/indra/newview/lltool.cpp +++ b/indra/newview/lltool.cpp @@ -46,9 +46,9 @@ extern BOOL gDebugClicks; //static -const LLString LLTool::sNameNull("null"); +const std::string LLTool::sNameNull("null"); -LLTool::LLTool( const LLString& name, LLToolComposite* composite ) : +LLTool::LLTool( const std::string& name, LLToolComposite* composite ) : mComposite( composite ), mName(name) { @@ -124,7 +124,7 @@ BOOL LLTool::handleRightMouseUp(S32 x, S32 y, MASK mask) return FALSE; } -BOOL LLTool::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen) +BOOL LLTool::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen) { // by default, didn't handle it // llinfos << "LLTool::handleToolTip" << llendl; |