Skip to content

Commit 3e2866f

Browse files
committed
#2395 fix start location coordinates getting double escaped
1 parent 0edf6e2 commit 3e2866f

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

indra/newview/lllogininstance.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,13 +602,14 @@ std::string construct_start_string()
602602
{
603603
// a startup URL was specified
604604
LLVector3 position = start_slurl.getPosition();
605-
std::string unescaped_start =
605+
// NOTE - do not xml escape here, will get escaped properly later by LLSD::asXMLRPCValue()
606+
// see secondlife/viewer#2395
607+
start =
606608
STRINGIZE( "uri:"
607609
<< start_slurl.getRegion() << "&"
608610
<< position[VX] << "&"
609611
<< position[VY] << "&"
610612
<< position[VZ]);
611-
start = LLStringFn::xml_encode(unescaped_start, true);
612613
break;
613614
}
614615
case LLSLURL::HOME_LOCATION:

0 commit comments

Comments
 (0)