diff options
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 15 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 24 |
3 files changed, 1 insertions, 43 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 9203169..05eaf2a 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
@@ -1251,12 +1251,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1251 | public override Vector3 PIDTarget { set { return; } } | 1251 | public override Vector3 PIDTarget { set { return; } } |
1252 | public override bool PIDActive | 1252 | public override bool PIDActive |
1253 | { | 1253 | { |
1254 | <<<<<<< HEAD | ||
1255 | get { return false; } | 1254 | get { return false; } |
1256 | ======= | ||
1257 | // os version | ||
1258 | // get { return false; } | ||
1259 | >>>>>>> avn/ubitvar | ||
1260 | set { return; } | 1255 | set { return; } |
1261 | } | 1256 | } |
1262 | public override float PIDTau { set { return; } } | 1257 | public override float PIDTau { set { return; } } |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 6363422..0a99e30 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -2955,14 +2955,8 @@ Console.WriteLine(" JointCreateFixed"); | |||
2955 | m_log.WarnFormat("[PHYSICS]: Got NaN PIDTarget from Scene on Object {0}", Name); | 2955 | m_log.WarnFormat("[PHYSICS]: Got NaN PIDTarget from Scene on Object {0}", Name); |
2956 | } | 2956 | } |
2957 | } | 2957 | } |
2958 | <<<<<<< HEAD | ||
2959 | public override bool PIDActive { get; set; } | ||
2960 | ======= | ||
2961 | // os version | ||
2962 | //public override bool PIDActive {get { return m_usePID; } set { m_usePID = value; } } | ||
2963 | public override bool PIDActive { set { m_usePID = value; } } | ||
2964 | 2958 | ||
2965 | >>>>>>> avn/ubitvar | 2959 | public override bool PIDActive { get; set; } |
2966 | public override float PIDTau { set { m_PIDTau = value; } } | 2960 | public override float PIDTau { set { m_PIDTau = value; } } |
2967 | 2961 | ||
2968 | public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } } | 2962 | public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } } |
@@ -3359,14 +3353,7 @@ Console.WriteLine(" JointCreateFixed"); | |||
3359 | RequestAssetDelegate assetProvider = _parent_scene.RequestAssetMethod; | 3353 | RequestAssetDelegate assetProvider = _parent_scene.RequestAssetMethod; |
3360 | if (assetProvider != null) | 3354 | if (assetProvider != null) |
3361 | assetProvider(_pbs.SculptTexture, MeshAssetReceived); | 3355 | assetProvider(_pbs.SculptTexture, MeshAssetReceived); |
3362 | <<<<<<< HEAD | ||
3363 | }, null, "ODEPrim.CheckMeshAsset"); | 3356 | }, null, "ODEPrim.CheckMeshAsset"); |
3364 | ======= | ||
3365 | // os version | ||
3366 | //}, null, "ODEPrim.CheckMeshAsset"); | ||
3367 | // avn | ||
3368 | }); | ||
3369 | >>>>>>> avn/ubitvar | ||
3370 | } | 3357 | } |
3371 | } | 3358 | } |
3372 | 3359 | ||
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 7f4a809..3776ac9 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
@@ -2020,35 +2020,11 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2020 | 2020 | ||
2021 | #region Add/Remove Entities | 2021 | #region Add/Remove Entities |
2022 | 2022 | ||
2023 | <<<<<<< HEAD | ||
2024 | public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying) | 2023 | public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying) |
2025 | { | 2024 | { |
2026 | OdeCharacter newAv | 2025 | OdeCharacter newAv |
2027 | = new OdeCharacter( | 2026 | = new OdeCharacter( |
2028 | avName, this, position, velocity, size, avPIDD, avPIDP, | 2027 | avName, this, position, velocity, size, avPIDD, avPIDP, |
2029 | ======= | ||
2030 | /* core version | ||
2031 | public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying) | ||
2032 | { | ||
2033 | OdeCharacter newAv | ||
2034 | = new OdeCharacter( | ||
2035 | avName, this, position, velocity, size, avPIDD, avPIDP, | ||
2036 | avCapRadius, avStandupTensor, avDensity, | ||
2037 | avMovementDivisorWalk, avMovementDivisorRun); | ||
2038 | |||
2039 | newAv.Flying = isFlying; | ||
2040 | newAv.MinimumGroundFlightOffset = minimumGroundFlightOffset; | ||
2041 | newAv.m_avatarplanted = avplanted; | ||
2042 | |||
2043 | return newAv; | ||
2044 | } | ||
2045 | */ | ||
2046 | public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying) | ||
2047 | { | ||
2048 | OdeCharacter newAv | ||
2049 | = new OdeCharacter( | ||
2050 | avName, this, position, Vector3.Zero, size, avPIDD, avPIDP, | ||
2051 | >>>>>>> avn/ubitvar | ||
2052 | avCapRadius, avStandupTensor, avDensity, | 2028 | avCapRadius, avStandupTensor, avDensity, |
2053 | avMovementDivisorWalk, avMovementDivisorRun); | 2029 | avMovementDivisorWalk, avMovementDivisorRun); |
2054 | 2030 | ||