diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-08-13 17:58:01 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-08-13 17:58:01 -0400 |
| commit | 383edf8015743becc37650ab018a112b9ff347b1 (patch) | |
| tree | 1e9a33f1517c6fff3416f5426de525628f1d29c2 /indra/newview/llurldispatcher.cpp | |
| parent | d56958e68934e673195ec2966e0a3c20dac7fb41 (diff) | |
| parent | 06b605b8666f2336e77126f8ff47765115c08a27 (diff) | |
merge changes for MAINT-4356
Diffstat (limited to 'indra/newview/llurldispatcher.cpp')
| -rwxr-xr-x | indra/newview/llurldispatcher.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp index 615064c782..78268944fc 100755 --- a/indra/newview/llurldispatcher.cpp +++ b/indra/newview/llurldispatcher.cpp @@ -278,13 +278,13 @@ public: tokens[2].asReal(), tokens[3].asReal()); } - - LLSD args; - args["LOCATION"] = tokens[0]; // Region names may be %20 escaped. std::string region_name = LLURI::unescape(tokens[0]); + LLSD args; + args["LOCATION"] = region_name; + LLSD payload; payload["region_name"] = region_name; payload["callback_url"] = LLSLURL(region_name, coords).getSLURLString(); |