diff options
author | Justin Clark-Casey (justincc) | 2010-08-18 23:15:25 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-08-18 23:15:25 +0100 |
commit | 8c12f22140d2885bb79aa4e201345ae6fd45fec6 (patch) | |
tree | e6d3fd25eafdee7f790f54d092e8494be4715149 /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
parent | Add textures no longer shipped with newer viewers to OpenSim's standard asset... (diff) | |
parent | Prevent a bad cast in llCreateLink(). (diff) | |
download | opensim-SC_OLD-8c12f22140d2885bb79aa4e201345ae6fd45fec6.zip opensim-SC_OLD-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.gz opensim-SC_OLD-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.bz2 opensim-SC_OLD-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index c11b9a2..1d3bdf3 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); |
@@ -3022,7 +3033,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3022 | { | 3033 | { |
3023 | OSDMap GroupDataMap = new OSDMap(6); | 3034 | OSDMap GroupDataMap = new OSDMap(6); |
3024 | OSDMap NewGroupDataMap = new OSDMap(1); | 3035 | OSDMap NewGroupDataMap = new OSDMap(1); |
3025 | GroupDataMap.Add("GroupPowers", OSD.FromBinary(m.GroupPowers)); | 3036 | GroupDataMap.Add("GroupPowers", OSD.FromULong(m.GroupPowers)); |
3026 | GroupDataMap.Add("AcceptNotices", OSD.FromBoolean(m.AcceptNotices)); | 3037 | GroupDataMap.Add("AcceptNotices", OSD.FromBoolean(m.AcceptNotices)); |
3027 | GroupDataMap.Add("GroupTitle", OSD.FromString(m.GroupTitle)); | 3038 | GroupDataMap.Add("GroupTitle", OSD.FromString(m.GroupTitle)); |
3028 | GroupDataMap.Add("GroupID", OSD.FromUUID(m.GroupID)); | 3039 | GroupDataMap.Add("GroupID", OSD.FromUUID(m.GroupID)); |