OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packet 

we used to send before slimupdates and explicitly send it
soprefactor
Melanie 2010-06-12 01:25:25 +01:00
parent ed38b4a140
commit c8ed972443
10 changed files with 71 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Client/MXP/ClientStack/MXPClientView.cs
View File

@ -1711,5 +1711,9 @@ namespace OpenSim.Client.MXP.ClientStack
public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId)
{
}
public void StopFlying(ISceneEntity presence)
{
}
}
}

4
OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
View File

@ -1199,6 +1199,10 @@ namespace OpenSim.Client.Sirikata.ClientStack
{
}
public void StopFlying(ISceneEntity presence)
{
}
#endregion
}
}

4
OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
View File

@ -1214,5 +1214,9 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId)
{
}
public void StopFlying(ISceneEntity presence)
{
}
}
}

2
OpenSim/Framework/IClientAPI.cs
View File

@ -1308,5 +1308,7 @@ namespace OpenSim.Framework
void SendChangeUserRights(UUID agentID, UUID friendID, int rights);
void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId);
void StopFlying(ISceneEntity presence);
}
}

40
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -11843,5 +11843,45 @@ namespace OpenSim.Region.ClientStack.LindenUDP
dialog.Buttons = buttons;
OutPacket(dialog, ThrottleOutPacketType.Task);
}
public void StopFlying(ISceneEntity p)
{
ScenePresence presence = p as ScenePresence;
// It turns out to get the agent to stop flying, you have to feed it stop flying velocities
// There's no explicit message to send the client to tell it to stop flying.. it relies on the
// velocity, collision plane and avatar height
// Add 1/6 the avatar's height to it's position so it doesn't shoot into the air
// when the avatar stands up
Vector3 pos = presence.AbsolutePosition;
if (presence.Appearance.AvatarHeight != 127.0f)
pos += new Vector3(0f, 0f, (presence.Appearance.AvatarHeight / 6f));
else
pos += new Vector3(0f, 0f, (1.56f / 6f));
presence.AbsolutePosition = pos;
ImprovedTerseObjectUpdatePacket.ObjectDataBlock block =
CreateImprovedTerseBlock(p, false);
const float TIME_DILATION = 1.0f;
ushort timeDilation = Utils.FloatToUInt16(TIME_DILATION, 0.0f, 1.0f);
ImprovedTerseObjectUpdatePacket packet = new ImprovedTerseObjectUpdatePacket();
packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
packet.RegionData.TimeDilation = timeDilation;
packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
packet.ObjectData[0] = block;
OutPacket(packet, ThrottleOutPacketType.Task, true);
//ControllingClient.SendAvatarTerseUpdate(new SendAvatarTerseData(m_rootRegionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId,
// AbsolutePosition, Velocity, Vector3.Zero, m_bodyRot, new Vector4(0,0,1,AbsolutePosition.Z - 0.5f), m_uuid, null, GetUpdatePriority(ControllingClient)));
}
}
}

4
OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
View File

@ -1155,5 +1155,9 @@ namespace OpenSim.Region.Examples.SimpleModule
public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId)
{
}
public void StopFlying(ISceneEntity presence)
{
}
}
}

20
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -1015,25 +1015,7 @@ namespace OpenSim.Region.Framework.Scenes
public void StopFlying()
{
// It turns out to get the agent to stop flying, you have to feed it stop flying velocities
// There's no explicit message to send the client to tell it to stop flying.. it relies on the
// velocity, collision plane and avatar height
// Add 1/6 the avatar's height to it's position so it doesn't shoot into the air
// when the avatar stands up
if (m_avHeight != 127.0f)
{
AbsolutePosition = AbsolutePosition + new Vector3(0f, 0f, (m_avHeight / 6f));
}
else
{
AbsolutePosition = AbsolutePosition + new Vector3(0f, 0f, (1.56f / 6f));
}
ControllingClient.SendPrimUpdate(this, PrimUpdateFlags.Position);
//ControllingClient.SendAvatarTerseUpdate(new SendAvatarTerseData(m_rootRegionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId,
// AbsolutePosition, Velocity, Vector3.Zero, m_bodyRot, new Vector4(0,0,1,AbsolutePosition.Z - 0.5f), m_uuid, null, GetUpdatePriority(ControllingClient)));
ControllingClient.StopFlying(this);
}
public void AddNeighbourRegion(ulong regionHandle, string cap)

4
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
View File

@ -1680,5 +1680,9 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId)
{
}
public void StopFlying(ISceneEntity presence)
{
}
}
}

4
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
View File

@ -1162,5 +1162,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC
public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId)
{
}
public void StopFlying(ISceneEntity presence)
{
}
}
}

4
OpenSim/Tests/Common/Mock/TestClient.cs
View File

@ -1216,5 +1216,9 @@ namespace OpenSim.Tests.Common.Mock
public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId)
{
}
public void StopFlying(ISceneEntity presence)
{
}
}
}