merge changes for storm-632

2011-08-15 09:44:42 -04:00 · 2011-08-15 09:44:42 -04:00 · efd4137839
parent 91ac6b16f5 ba129fff47
commit efd4137839
1 changed files with 1 additions and 1 deletions
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@ -1134,7 +1134,7 @@ std::string LLUrlEntryWorldMap::getLocation(const std::string &url) const
 //
 LLUrlEntryNoLink::LLUrlEntryNoLink()
 {
-	mPattern = boost::regex("<nolink>[^<]*</nolink>",
+	mPattern = boost::regex("<nolink>.*?</nolink>",
 							boost::regex::perl|boost::regex::icase);
 }