diff options
| author | Aura Linden <aura@lindenlab.com> | 2015-10-13 16:44:20 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2015-10-13 16:44:20 -0700 |
| commit | 2f6166a5a4f8d5be679cef0699142c4ef061fb55 (patch) | |
| tree | f45efe7e4c55c37dc097f15f8e0f445d86bfe972 /indra/newview/llslurl.cpp | |
| parent | 8729f5d23a52263e55df5574c672c87d00b563bd (diff) | |
| parent | a16a6034c25c5e78331ef1bd13485df8759456e5 (diff) | |
Pulled merge from llinternal/bento-box.
Diffstat (limited to 'indra/newview/llslurl.cpp')
| -rwxr-xr-x | indra/newview/llslurl.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp index 728fc69723..a8e012bfa1 100755 --- a/indra/newview/llslurl.cpp +++ b/indra/newview/llslurl.cpp @@ -271,7 +271,14 @@ LLSLURL::LLSLURL(const std::string& slurl) // at this point, head of the path array should be [ <region>, <x>, <y>, <z> ] where x, y and z // are collectively optional // are optional + mRegion = LLURI::unescape(path_array[0].asString()); + + if(LLStringUtil::containsNonprintable(mRegion)) + { + LLStringUtil::stripNonprintable(mRegion); + } + path_array.erase(0); // parse the x, y, and optionally z |