diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-26 13:13:26 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-26 13:13:26 -0500 |
| commit | 3b52ab6cf17ceae4a2d45a8477b8643a9e3c6162 (patch) | |
| tree | 58491dbe94278921244e05927d0d58b580304646 /indra/llui/llurlentry.cpp | |
| parent | 27c83bf399f2ca91f0444aa97a98af00a2483c30 (diff) | |
| parent | 470c05b70808f0a51090c0f50847fe614bf041e9 (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"); |