summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2024-08-26 14:49:11 -0700
committerBrad Linden <brad@lindenlab.com>2024-08-26 14:49:11 -0700
commit3e2866f876696b149cee248e1e9bf5343dff0de6 (patch)
tree287c36adfc097556307d796a3181db762eab08fb
parent0edf6e230e4580fc61917bc823f82d983d807ccf (diff)
secondlife/viewer#2395 fix start location coordinates getting double escaped
-rw-r--r--indra/newview/lllogininstance.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index c54d2c080f..ad04c11cc6 100644
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -602,13 +602,14 @@ std::string construct_start_string()
{
// a startup URL was specified
LLVector3 position = start_slurl.getPosition();
- std::string unescaped_start =
+ // NOTE - do not xml escape here, will get escaped properly later by LLSD::asXMLRPCValue()
+ // see secondlife/viewer#2395
+ start =
STRINGIZE( "uri:"
<< start_slurl.getRegion() << "&"
<< position[VX] << "&"
<< position[VY] << "&"
<< position[VZ]);
- start = LLStringFn::xml_encode(unescaped_start, true);
break;
}
case LLSLURL::HOME_LOCATION: