aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.RegionServer/ClientView.API.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/OpenSim.RegionServer/ClientView.API.cs')
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.API.cs34
1 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
index 80719d6..bb4dccd 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
@@ -365,22 +365,22 @@ namespace OpenSim
365 365
366 public void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags) 366 public void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags)
367 { 367 {
368 TeleportLocalPacket tpLocal2 = new TeleportLocalPacket(); 368 TeleportLocalPacket tpLocal = new TeleportLocalPacket();
369 tpLocal2.Info.AgentID = this.AgentID; 369 tpLocal.Info.AgentID = this.AgentID;
370 tpLocal2.Info.TeleportFlags = flags; 370 tpLocal.Info.TeleportFlags = flags;
371 tpLocal2.Info.LocationID = 2; 371 tpLocal.Info.LocationID = 2;
372 tpLocal2.Info.LookAt = lookAt; 372 tpLocal.Info.LookAt = lookAt;
373 tpLocal2.Info.Position = position; 373 tpLocal.Info.Position = position;
374 OutPacket(tpLocal2); 374 OutPacket(tpLocal);
375 } 375 }
376 376
377 public void SendRegionTeleport(ulong regionHandle, byte simAccess, string ipAddress, ushort ipPort, uint locationID, uint flags) 377 public void SendRegionTeleport(ulong regionHandle, byte simAccess, string ipAddress, ushort ipPort, uint locationID, uint flags)
378 { 378 {
379 TeleportFinishPacket Teleport = new TeleportFinishPacket(); 379 TeleportFinishPacket teleport = new TeleportFinishPacket();
380 Teleport.Info.AgentID = this.AgentID; 380 teleport.Info.AgentID = this.AgentID;
381 Teleport.Info.RegionHandle = regionHandle; 381 teleport.Info.RegionHandle = regionHandle;
382 Teleport.Info.SimAccess = simAccess; 382 teleport.Info.SimAccess = simAccess;
383 Teleport.Info.SeedCapability = new byte[0]; 383 teleport.Info.SeedCapability = new byte[0];
384 384
385 System.Net.IPAddress oIP = System.Net.IPAddress.Parse(ipAddress); 385 System.Net.IPAddress oIP = System.Net.IPAddress.Parse(ipAddress);
386 byte[] byteIP = oIP.GetAddressBytes(); 386 byte[] byteIP = oIP.GetAddressBytes();
@@ -389,11 +389,11 @@ namespace OpenSim
389 ip += (uint)byteIP[1] << 8; 389 ip += (uint)byteIP[1] << 8;
390 ip += (uint)byteIP[0]; 390 ip += (uint)byteIP[0];
391 391
392 Teleport.Info.SimIP = ip; 392 teleport.Info.SimIP = ip;
393 Teleport.Info.SimPort = ipPort; 393 teleport.Info.SimPort = ipPort;
394 Teleport.Info.LocationID = 4; 394 teleport.Info.LocationID = 4;
395 Teleport.Info.TeleportFlags = 1 << 4; 395 teleport.Info.TeleportFlags = 1 << 4;
396 OutPacket(Teleport); 396 OutPacket(teleport);
397 } 397 }
398 398
399 /// <summary> 399 /// <summary>