diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-08-26 17:28:34 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-08-26 17:28:34 -0700 |
| commit | 124f0711afd504847f3c4cc96f1f5c000f7f58b0 (patch) | |
| tree | 01c8577658901d852d26f30203f631359f2f0923 /indra/newview/lllogininstance.cpp | |
| parent | 39c7f149e4d38232469473b0275028485493b4ec (diff) | |
| parent | 50dc4cbdf9640601ca164086bee4f3a7b91868ca (diff) | |
Merge remote-tracking branch 'origin/release/2024.08-DeltaFPS' into develop
Diffstat (limited to 'indra/newview/lllogininstance.cpp')
| -rw-r--r-- | indra/newview/lllogininstance.cpp | 5 |
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: |