a forgotten file plus minor changes. Imp and SL viewer seem to preserve

flight. FS 4.2.2 does not.
This commit is contained in:
UbitUmarov
2012-09-04 07:32:03 +01:00
parent e1755e2d71
commit d4fad2ba42
3 changed files with 11 additions and 3 deletions

View File

@@ -151,6 +151,10 @@ namespace OpenSim.Region.ClientStack.Linden
ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint,
uint locationID, uint flags, string capsURL, UUID agentID)
{
ulong tpflags = 1L << 4; // AgentManager.TeleportFlags.ViaLocation
if((flags & (uint)TeleportFlags.IsFlying) != 0)
tpflags |= 1 << 13; // IsFLying;
OSDMap info = new OSDMap();
info.Add("AgentID", OSD.FromUUID(agentID));
info.Add("LocationID", OSD.FromInteger(4)); // TODO what is this?
@@ -159,7 +163,8 @@ namespace OpenSim.Region.ClientStack.Linden
info.Add("SimAccess", OSD.FromInteger(simAccess));
info.Add("SimIP", OSD.FromBinary(regionExternalEndPoint.Address.GetAddressBytes()));
info.Add("SimPort", OSD.FromInteger(regionExternalEndPoint.Port));
info.Add("TeleportFlags", OSD.FromULong(1L << 4)); // AgentManager.TeleportFlags.ViaLocation
// info.Add("TeleportFlags", OSD.FromULong(1L << 4)); // AgentManager.TeleportFlags.ViaLocation
info.Add("TeleportFlags", OSD.FromULong(tpflags));
OSDArray infoArr = new OSDArray();
infoArr.Add(info);