diff options
author | Melanie | 2019-08-09 11:02:04 +0100 |
---|---|---|
committer | Melanie | 2019-08-09 11:02:04 +0100 |
commit | f332f3fc41345581f94c795e86e918c2c28f1512 (patch) | |
tree | f4a4999f12ae0ece73c0c455ae06178b9ce728a4 /OpenSim/Server | |
parent | No idea where this diff comes from - change case to lower (diff) | |
parent | add cap EstateChangeInfo (diff) | |
download | opensim-SC-f332f3fc41345581f94c795e86e918c2c28f1512.zip opensim-SC-f332f3fc41345581f94c795e86e918c2c28f1512.tar.gz opensim-SC-f332f3fc41345581f94c795e86e918c2c28f1512.tar.bz2 opensim-SC-f332f3fc41345581f94c795e86e918c2c28f1512.tar.xz |
Merge branch 'master' of brain.opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Server')
-rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 788bd3d..73bab61 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
@@ -456,12 +456,9 @@ namespace OpenSim.Server.Handlers.Simulation | |||
456 | { | 456 | { |
457 | source = new GridRegion(); | 457 | source = new GridRegion(); |
458 | source.RegionID = UUID.Parse(tmpOSD.AsString()); | 458 | source.RegionID = UUID.Parse(tmpOSD.AsString()); |
459 | tmpOSD = args["source_x"]; | 459 | source.RegionLocX = Int32.Parse(args["source_x"].AsString()); |
460 | source.RegionLocX = Int32.Parse(tmpOSD.AsString()); | 460 | source.RegionLocY = Int32.Parse(args["source_y"].AsString()); |
461 | tmpOSD = args["source_y"]; | 461 | source.RegionName = args["source_name"].AsString(); |
462 | source.RegionLocY = Int32.Parse(tmpOSD.AsString()); | ||
463 | tmpOSD = args["source_name"]; | ||
464 | source.RegionName = tmpOSD.AsString(); | ||
465 | 462 | ||
466 | if (args.TryGetValue("source_server_uri", out tmpOSD)) | 463 | if (args.TryGetValue("source_server_uri", out tmpOSD)) |
467 | source.RawServerURI = tmpOSD.AsString(); | 464 | source.RawServerURI = tmpOSD.AsString(); |