diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-10-13 08:43:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-10-13 08:43:03 -0400 |
| commit | 69ff937e47248eca0a4f876efebe97ee57bd4da9 (patch) | |
| tree | 4fde61ed0ed439b0bf033b15f6703d72bee6f561 /indra/newview/llslurl.cpp | |
| parent | 9367a3787929dfff8b46763d9a7b4872c469e85a (diff) | |
| parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) | |
merge changes for 3.8.5-release
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 |