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 | |
| parent | 97631054272eeb83155f70fec6a869efc39079e5 (diff) | |
svn merge -r 70819:70853 svn+ssh://svn/svn/linden/branches/urldispatcher-for-merge
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 3 | ||||
| -rw-r--r-- | indra/llui/lltexteditor.h | 10 |
2 files changed, 8 insertions, 5 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 diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h index e19e799033..ea2e6b3efe 100644 --- a/indra/llui/lltexteditor.h +++ b/indra/llui/lltexteditor.h @@ -194,9 +194,10 @@ public: // Callbacks static void setLinkColor(LLColor4 color) { mLinkColor = color; } - static void setURLCallbacks( void (*callback1) (const char* url), - BOOL (*callback2) (LLString url) ) - { mURLcallback = callback1; mSecondlifeURLcallback = callback2;} + static void setURLCallbacks(void (*callback1) (const char* url), + bool (*callback2) (const std::string& url), + bool (*callback3) (const std::string& url) ) + { mURLcallback = callback1; mSecondlifeURLcallback = callback2; mSecondlifeURLcallbackRightClick = callback3;} void setOnScrollEndCallback(void (*callback)(void*), void* userdata); @@ -318,7 +319,8 @@ public: LLKeywords mKeywords; static LLColor4 mLinkColor; static void (*mURLcallback) (const char* url); - static BOOL (*mSecondlifeURLcallback) (LLString url); + static bool (*mSecondlifeURLcallback) (const std::string& url); + static bool (*mSecondlifeURLcallbackRightClick) (const std::string& url); protected: LLWString mWText; mutable LLString mUTF8Text; |