diff options
| author | Tess Chu <tess@lindenlab.com> | 2007-10-02 22:38:38 +0000 |
|---|---|---|
| committer | Tess Chu <tess@lindenlab.com> | 2007-10-02 22:38:38 +0000 |
| commit | cfd17f3322ec9c8efb120faa23adb83846272193 (patch) | |
| tree | eefbf2fefcac737d4050fba10e072fe951cd4381 /indra/llui/lltexteditor.cpp | |
| parent | 97631054272eeb83155f70fec6a869efc39079e5 (diff) | |
svn merge -r 70819:70853 svn+ssh://svn/svn/linden/branches/urldispatcher-for-merge
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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 |