ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

ubode collision with objects was disabling push freemove when standing on a prim

Browse Source
This commit is contained in:
UbitUmarov
2022-04-15 23:51:45 +01:00
parent a7e189a53d
commit 3bfc2a71b0
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
View File

@@ -364,8 +364,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
if (value)
{
m_colliderfilter += 3;
if (m_colliderfilter > 3)
m_colliderfilter = 3;
if (m_colliderfilter > 9)
m_colliderfilter = 9;
}
else
{
@@ -374,7 +374,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
m_colliderfilter = 0;
}
if (m_colliderfilter == 0)
if (m_colliderfilter < 6)
m_iscolliding = false;
else
{
@@ -1378,7 +1378,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
if (!m_iscolliding)
m_collideNormal.Z = 0;
bool tviszero = (ctz.X == 0.0f && ctz.Y == 0.0f && ctz.Z == 0.0f);
bool tviszero = ctz.IsZero();
if (!tviszero)
{
@@ -1396,7 +1396,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
ctz.Z *= 2;
}
}
if (!m_freemove)
@@ -1780,7 +1779,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
if (ncolisions == 0)
{
SentEmptyCollisionsEvent = true;
// _parent_scene.RemoveCollisionEventReporting(this);
//_parent_scene.RemoveCollisionEventReporting(this);
}
else
{