ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dotnet6' of ssh://opensimulator.org:/var/git/opensim into dotnet6

Browse Source
This commit is contained in:
UbitUmarov
2023-05-31 19:29:21 +01:00
parent 182bf163fb 1527d42823
commit a76a65d0a4
3 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/PhysicsModules/BulletS/BSActorLockAxis.cs
View File

@@ -162,9 +162,6 @@ namespace OpenSim.Region.PhysicsModule.BulletS
// http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?p=20817
// http://www.bulletphysics.org/Bullet/phpBB3/viewtopic.php?p=26380
// Remove any existing axis constraint (just to be sure)
RemoveAxisLockConstraint();
BSConstraint6Dof axisConstrainer = new BSConstraint6Dof(m_physicsScene.World, m_controllingPrim.PhysBody,
OMV.Vector3.Zero, OMV.Quaternion.Identity,
false /* useLinearReferenceFrameB */, true /* disableCollisionsBetweenLinkedBodies */);

1
OpenSim/Region/PhysicsModules/BulletS/BSActorSetForce.cs
View File

@@ -73,7 +73,6 @@ namespace OpenSim.Region.PhysicsModule.BulletS
{
m_physicsScene.DetailLog("{0},BSActorSetForce,refresh,notSetForce,removing={1}", m_controllingPrim.LocalID, ActorName);
Enabled = false;
return;
}
// If the object is physically active, add the hoverer prestep action

1
OpenSim/Region/PhysicsModules/BulletS/BSActorSetTorque.cs
View File

@@ -73,7 +73,6 @@ namespace OpenSim.Region.PhysicsModule.BulletS
{
m_physicsScene.DetailLog("{0},BSActorSetTorque,refresh,notSetTorque,disabling={1}", m_controllingPrim.LocalID, ActorName);
Enabled = false;
return;
}
// If the object is physically active, add the hoverer prestep action