ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 11:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

change sp delayed stop

Browse Source
This commit is contained in:
UbitUmarov
2022-04-26 03:05:43 +01:00
parent d39cf47bb8
commit e0a33297dd
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@@ -8249,11 +8249,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
Math.Abs(x.CameraAtAxis.X - m_thisAgentUpdateArgs.CameraAtAxis.X) > VDELTA ||
Math.Abs(x.CameraAtAxis.Y - m_thisAgentUpdateArgs.CameraAtAxis.Y) > VDELTA ||
//Math.Abs(x.CameraAtAxis.Z - m_thisAgentUpdateArgs.CameraAtAxis.Z) > VDELTA ||
Math.Abs(x.CameraUpAxis.X - m_thisAgentUpdateArgs.CameraUpAxis.X) > VDELTA ||
Math.Abs(x.CameraUpAxis.Y - m_thisAgentUpdateArgs.CameraUpAxis.Y) > VDELTA
//Math.Abs(x.CameraLeftAxis.Z - m_thisAgentUpdateArgs.CameraLeftAxis.Z) > VDELTA ||
);
}

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

@@ -2707,7 +2707,7 @@ namespace OpenSim.Region.Framework.Scenes
//update_movementflag |= (MovementFlags ^ oldflags) != 0;
update_movementflag = true;
if (m_delayedStop < 0 && (flags & (ACFlags.AGENT_CONTROL_FAST_AT | ACFlags.AGENT_CONTROL_FAST_UP)) == 0)
if (!m_setAlwaysRun && (flags & (ACFlags.AGENT_CONTROL_FAST_AT | ACFlags.AGENT_CONTROL_FAST_UP)) == 0)
agent_velocity = AgentControlMidVel;
if ((MovementFlags & CONTROL_FLAG_NUDGE_MASK) != 0)
@@ -3722,7 +3722,7 @@ namespace OpenSim.Region.Framework.Scenes
// m_log.DebugFormat(
// "[SCENE PRESENCE]: Adding new movement {0} with rotation {1}, thisAddSpeedModifier {2} for {3}",
// vec, Rotation, thisAddSpeedModifier, Name);
//m_delayedStop = -1;
m_delayedStop = -1;
// rotate from avatar coord space to world
Quaternion rot = Rotation;
if (!Flying && !IsNPC)
@@ -3783,8 +3783,8 @@ namespace OpenSim.Region.Framework.Scenes
#region Overridden Methods
const float ROTATION_TOLERANCE = 0.005f;
const float VELOCITY_TOLERANCE = 0.005f;
const float ROTATION_TOLERANCE = 0.01f;
const float VELOCITY_TOLERANCE = 0.1f;
const float LOWVELOCITYSQ = 0.1f;
const float POSITION_LARGETOLERANCE = 5f;
const float POSITION_SMALLTOLERANCE = 0.05f;
@@ -3817,7 +3817,10 @@ namespace OpenSim.Region.Framework.Scenes
if(IsSatOnObject)
m_delayedStop = -1;
else if(Util.GetTimeStampMS() > m_delayedStop)
{
m_delayedStop = -1;
AddNewMovement(Vector3.Zero, 0);
}
}
if (Appearance.AvatarSize.NotEqual(m_lastSize))