diff options
| author | UbitUmarov | 2012-09-04 10:51:43 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-09-04 10:51:43 +0100 |
| commit | c298ae9e75f00f2009c87de30b295af20dcb86a2 (patch) | |
| tree | 596ef1c932a4cef43e8a622ef3a6a6081cef73a5 /OpenSim | |
| parent | a forgotten file plus minor changes. Imp and SL viewer seem to preserve (diff) | |
| download | opensim-SC_OLD-c298ae9e75f00f2009c87de30b295af20dcb86a2.zip opensim-SC_OLD-c298ae9e75f00f2009c87de30b295af20dcb86a2.tar.gz opensim-SC_OLD-c298ae9e75f00f2009c87de30b295af20dcb86a2.tar.bz2 opensim-SC_OLD-c298ae9e75f00f2009c87de30b295af20dcb86a2.tar.xz | |
bug fix
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs index fb41d23..7dcf137 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs | |||
| @@ -151,9 +151,11 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 151 | ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, | 151 | ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, |
| 152 | uint locationID, uint flags, string capsURL, UUID agentID) | 152 | uint locationID, uint flags, string capsURL, UUID agentID) |
| 153 | { | 153 | { |
| 154 | ulong tpflags = 1L << 4; // AgentManager.TeleportFlags.ViaLocation | 154 | // not sure why flags get overwritten here |
| 155 | if((flags & (uint)TeleportFlags.IsFlying) != 0) | 155 | if ((flags & (uint)TeleportFlags.IsFlying) != 0) |
| 156 | tpflags |= 1 << 13; // IsFLying; | 156 | flags = (uint)TeleportFlags.ViaLocation | (uint)TeleportFlags.IsFlying; |
| 157 | else | ||
| 158 | flags = (uint)TeleportFlags.ViaLocation; | ||
| 157 | 159 | ||
| 158 | OSDMap info = new OSDMap(); | 160 | OSDMap info = new OSDMap(); |
| 159 | info.Add("AgentID", OSD.FromUUID(agentID)); | 161 | info.Add("AgentID", OSD.FromUUID(agentID)); |
| @@ -164,7 +166,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 164 | info.Add("SimIP", OSD.FromBinary(regionExternalEndPoint.Address.GetAddressBytes())); | 166 | info.Add("SimIP", OSD.FromBinary(regionExternalEndPoint.Address.GetAddressBytes())); |
| 165 | info.Add("SimPort", OSD.FromInteger(regionExternalEndPoint.Port)); | 167 | info.Add("SimPort", OSD.FromInteger(regionExternalEndPoint.Port)); |
| 166 | // info.Add("TeleportFlags", OSD.FromULong(1L << 4)); // AgentManager.TeleportFlags.ViaLocation | 168 | // info.Add("TeleportFlags", OSD.FromULong(1L << 4)); // AgentManager.TeleportFlags.ViaLocation |
| 167 | info.Add("TeleportFlags", OSD.FromULong(tpflags)); | 169 | info.Add("TeleportFlags", OSD.FromUInteger(flags)); |
| 168 | 170 | ||
| 169 | OSDArray infoArr = new OSDArray(); | 171 | OSDArray infoArr = new OSDArray(); |
| 170 | infoArr.Add(info); | 172 | infoArr.Add(info); |