diff options
| author | Martin Reddy <lynx@lindenlab.com> | 2009-09-22 18:00:16 +0000 |
|---|---|---|
| committer | Martin Reddy <lynx@lindenlab.com> | 2009-09-22 18:00:16 +0000 |
| commit | 12762053e5aff372a9f8d473c71aa81e805bb474 (patch) | |
| tree | c2c29e3b178cc9c51b99bd94d2f478e96d8a7d30 /indra/llui/llurlregistry.h | |
| parent | be41bf82c6325fc45c7c6474645f384479e27091 (diff) | |
EXT-944 EXT-1026: converted the LLUrlRegistry::findUrl() method to
work on an LLWString instead of a std::string, so that we don't have
to worry about character offsets for variable-length-encoded UTF-8
strings.
This was causing crashes whenever we would try to show a textbox with
a URL and foreign characters (> 1 byte chars). Damn, I suck!
Diffstat (limited to 'indra/llui/llurlregistry.h')
| -rw-r--r-- | indra/llui/llurlregistry.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llurlregistry.h b/indra/llui/llurlregistry.h index 84b033036c..bf5257d630 100644 --- a/indra/llui/llurlregistry.h +++ b/indra/llui/llurlregistry.h @@ -37,6 +37,7 @@ #include "llurlentry.h" #include "llurlmatch.h" #include "llsingleton.h" +#include "llstring.h" #include <string> #include <vector> @@ -74,7 +75,7 @@ public: /// get the next Url in an input string, starting at a given character offset /// your callback is invoked if the matched Url's label changes in the future - bool findUrl(const std::string &text, LLUrlMatch &match, + bool findUrl(const LLWString &text, LLUrlMatch &match, const LLUrlLabelCallback &cb = &LLUrlRegistryNullCallback); private: |