aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorDiva Canto2010-08-16 11:33:59 -0700
committerDiva Canto2010-08-16 11:33:59 -0700
commit77de28965ae5fc6de3c60a28ce7d4e59643a2a70 (patch)
tree61259b696fb8d8a47f10cb83a72d1df145953b8f /OpenSim/Region/ClientStack
parentIncreased the timeout on AgentUpdate to 30 sec and improved error message to ... (diff)
downloadopensim-SC_OLD-77de28965ae5fc6de3c60a28ce7d4e59643a2a70.zip
opensim-SC_OLD-77de28965ae5fc6de3c60a28ce7d4e59643a2a70.tar.gz
opensim-SC_OLD-77de28965ae5fc6de3c60a28ce7d4e59643a2a70.tar.bz2
opensim-SC_OLD-77de28965ae5fc6de3c60a28ce7d4e59643a2a70.tar.xz
Work on TeleportStart: renamed method from TeleportLocationStart to TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule).
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs19
1 files changed, 15 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index c11b9a2..bb9e6d4 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1432,16 +1432,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1432 /// <summary> 1432 /// <summary>
1433 /// 1433 ///
1434 /// </summary> 1434 /// </summary>
1435 public void SendTeleportLocationStart() 1435 public void SendTeleportStart(uint flags)
1436 { 1436 {
1437 //TeleportStartPacket tpStart = (TeleportStartPacket)PacketPool.Instance.GetPacket(PacketType.TeleportStart); 1437 TeleportStartPacket tpStart = (TeleportStartPacket)PacketPool.Instance.GetPacket(PacketType.TeleportStart);
1438 TeleportStartPacket tpStart = new TeleportStartPacket(); 1438 //TeleportStartPacket tpStart = new TeleportStartPacket();
1439 tpStart.Info.TeleportFlags = 16; // Teleport via location 1439 tpStart.Info.TeleportFlags = flags; //16; // Teleport via location
1440 1440
1441 // Hack to get this out immediately and skip throttles 1441 // Hack to get this out immediately and skip throttles
1442 OutPacket(tpStart, ThrottleOutPacketType.Unknown); 1442 OutPacket(tpStart, ThrottleOutPacketType.Unknown);
1443 } 1443 }
1444 1444
1445 public void SendTeleportProgress(uint flags, string message)
1446 {
1447 TeleportProgressPacket tpProgress = (TeleportProgressPacket)PacketPool.Instance.GetPacket(PacketType.TeleportProgress);
1448 tpProgress.AgentData.AgentID = this.AgentId;
1449 tpProgress.Info.TeleportFlags = flags;
1450 tpProgress.Info.Message = Util.StringToBytes256(message);
1451
1452 // Hack to get this out immediately and skip throttles
1453 OutPacket(tpProgress, ThrottleOutPacketType.Unknown);
1454 }
1455
1445 public void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance) 1456 public void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance)
1446 { 1457 {
1447 MoneyBalanceReplyPacket money = (MoneyBalanceReplyPacket)PacketPool.Instance.GetPacket(PacketType.MoneyBalanceReply); 1458 MoneyBalanceReplyPacket money = (MoneyBalanceReplyPacket)PacketPool.Instance.GetPacket(PacketType.MoneyBalanceReply);