summaryrefslogtreecommitdiff
path: root/indra/llui/llurlentry.h
diff options
context:
space:
mode:
authorMartin Reddy <lynx@lindenlab.com>2009-09-22 18:00:16 +0000
committerMartin Reddy <lynx@lindenlab.com>2009-09-22 18:00:16 +0000
commit12762053e5aff372a9f8d473c71aa81e805bb474 (patch)
treec2c29e3b178cc9c51b99bd94d2f478e96d8a7d30 /indra/llui/llurlentry.h
parentbe41bf82c6325fc45c7c6474645f384479e27091 (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/llurlentry.h')
-rw-r--r--indra/llui/llurlentry.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index 54053872df..36758566ed 100644
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -68,7 +68,7 @@ public:
virtual ~LLUrlEntryBase();
/// Return the regex pattern that matches this Url
- boost::regex getPattern() const { return mPattern; }
+ boost::wregex getPattern() const { return mPattern; }
/// Return the url from a string that matched the regex
virtual std::string getUrl(const std::string &string);
@@ -102,7 +102,7 @@ protected:
LLUrlLabelSignal *signal;
} LLUrlEntryObserver;
- boost::regex mPattern;
+ boost::wregex mPattern;
std::string mIcon;
std::string mMenuName;
std::string mTooltip;