From cfd17f3322ec9c8efb120faa23adb83846272193 Mon Sep 17 00:00:00 2001 From: Tess Chu Date: Tue, 2 Oct 2007 22:38:38 +0000 Subject: svn merge -r 70819:70853 svn+ssh://svn/svn/linden/branches/urldispatcher-for-merge --- indra/llui/lltexteditor.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/llui/lltexteditor.cpp') diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index 1ec62f6927..daf3438d3c 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -58,7 +58,8 @@ const S32 SPACES_PER_TAB = 4; LLColor4 LLTextEditor::mLinkColor = LLColor4::blue; void (* LLTextEditor::mURLcallback)(const char*) = NULL; -BOOL (* LLTextEditor::mSecondlifeURLcallback)(LLString) = NULL; +bool (* LLTextEditor::mSecondlifeURLcallback)(const std::string&) = NULL; +bool (* LLTextEditor::mSecondlifeURLcallbackRightClick)(const std::string&) = NULL; /////////////////////////////////////////////////////////////////// //virtuals -- cgit v1.2.3