aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs27
1 files changed, 1 insertions, 26 deletions
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
index f8425da..601fd97 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
@@ -399,7 +399,6 @@ namespace OpenSim
399 { 399 {
400 OnRequestMapBlocks(this, MapRequest.PositionData.MinX, MapRequest.PositionData.MinY, MapRequest.PositionData.MaxX, MapRequest.PositionData.MaxY); 400 OnRequestMapBlocks(this, MapRequest.PositionData.MinX, MapRequest.PositionData.MinY, MapRequest.PositionData.MaxX, MapRequest.PositionData.MaxY);
401 } 401 }
402 //this.RequestMapBlocks(MapRequest.PositionData.MinX, MapRequest.PositionData.MinY, MapRequest.PositionData.MaxX, MapRequest.PositionData.MaxY);
403 break; 402 break;
404 case PacketType.TeleportLandmarkRequest: 403 case PacketType.TeleportLandmarkRequest:
405 TeleportLandmarkRequestPacket tpReq = (TeleportLandmarkRequestPacket)Pack; 404 TeleportLandmarkRequestPacket tpReq = (TeleportLandmarkRequestPacket)Pack;
@@ -451,7 +450,7 @@ namespace OpenSim
451 break; 450 break;
452 case PacketType.TeleportLocationRequest: 451 case PacketType.TeleportLocationRequest:
453 TeleportLocationRequestPacket tpLocReq = (TeleportLocationRequestPacket)Pack; 452 TeleportLocationRequestPacket tpLocReq = (TeleportLocationRequestPacket)Pack;
454 // Console.WriteLine(tpLocReq.ToString()); 453 // Console.WriteLine(tpLocReq.ToString());
455 454
456 if (OnTeleportLocationRequest != null) 455 if (OnTeleportLocationRequest != null)
457 { 456 {
@@ -463,32 +462,8 @@ namespace OpenSim
463 TeleportCancelPacket tpCancel = new TeleportCancelPacket(); 462 TeleportCancelPacket tpCancel = new TeleportCancelPacket();
464 tpCancel.Info.SessionID = tpLocReq.AgentData.SessionID; 463 tpCancel.Info.SessionID = tpLocReq.AgentData.SessionID;
465 tpCancel.Info.AgentID = tpLocReq.AgentData.AgentID; 464 tpCancel.Info.AgentID = tpLocReq.AgentData.AgentID;
466
467 OutPacket(tpCancel); 465 OutPacket(tpCancel);
468 } 466 }
469
470 /* if (m_regionData.RegionHandle != tpLocReq.Info.RegionHandle)
471 {
472 // m_gridServer.getRegion(tpLocReq.Info.RegionHandle);
473 Console.WriteLine("Inter-sim teleport not yet implemented");
474 TeleportCancelPacket tpCancel = new TeleportCancelPacket();
475 tpCancel.Info.SessionID = tpLocReq.AgentData.SessionID;
476 tpCancel.Info.AgentID = tpLocReq.AgentData.AgentID;
477
478 OutPacket(tpCancel);
479 }
480 else
481 {
482 Console.WriteLine("Local teleport");
483 TeleportLocalPacket tpLocal2 = new TeleportLocalPacket();
484 tpLocal2.Info.AgentID = tpLocReq.AgentData.AgentID;
485 tpLocal2.Info.TeleportFlags = tpStart.Info.TeleportFlags;
486 tpLocal2.Info.LocationID = 2;
487 tpLocal2.Info.LookAt = tpLocReq.Info.LookAt;
488 tpLocal2.Info.Position = tpLocReq.Info.Position;
489 OutPacket(tpLocal2);
490
491 }*/
492 break; 467 break;
493 #endregion 468 #endregion
494 469