diff options
| author | angela <angela@lindenlab.com> | 2010-02-23 23:57:50 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-02-23 23:57:50 +0800 |
| commit | 01ad8456a2566d258124677e0c7ce5eaa5003569 (patch) | |
| tree | 381f50d83c727a46044733a776a252427c91627e /indra/llui/llurlentry.cpp | |
| parent | e98d6a910a39671225f1af627570aee58517ea7f (diff) | |
| parent | 43a9699de16c85d1c1a599fbe14512fbb6cbada1 (diff) | |
merge
Diffstat (limited to 'indra/llui/llurlentry.cpp')
| -rw-r--r-- | indra/llui/llurlentry.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp index 3c73ae9b0c..20c939874b 100644 --- a/indra/llui/llurlentry.cpp +++ b/indra/llui/llurlentry.cpp @@ -232,7 +232,7 @@ std::string LLUrlEntryHTTPNoProtocol::getUrl(const std::string &string) const LLUrlEntrySLURL::LLUrlEntrySLURL() { // see http://slurl.com/about.php for details on the SLURL format - mPattern = boost::regex("http://(maps.secondlife.com|slurl.com)/secondlife/\\S+/?(\\d+)?/?(\\d+)?/?(\\d+)?/?\\S*", + mPattern = boost::regex("http://(maps.secondlife.com|slurl.com)/secondlife/[^ /]+(/\\d+){0,3}(/?(\\?title|\\?img|\\?msg)=\\S*)?/?", boost::regex::perl|boost::regex::icase); mMenuName = "menu_url_slurl.xml"; mTooltip = LLTrans::getString("TooltipSLURL"); |