diff options
author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |
parent | remove lixo (diff) | |
parent | dont change camera on crossings (diff) | |
download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz |
bad merge?
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODEPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index f934b8a..6363422 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -2955,7 +2955,14 @@ 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 | ||
2958 | public override bool PIDActive { get; set; } | 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 | |||
2965 | >>>>>>> avn/ubitvar | ||
2959 | public override float PIDTau { set { m_PIDTau = value; } } | 2966 | public override float PIDTau { set { m_PIDTau = value; } } |
2960 | 2967 | ||
2961 | public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } } | 2968 | public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } } |
@@ -3352,7 +3359,14 @@ Console.WriteLine(" JointCreateFixed"); | |||
3352 | RequestAssetDelegate assetProvider = _parent_scene.RequestAssetMethod; | 3359 | RequestAssetDelegate assetProvider = _parent_scene.RequestAssetMethod; |
3353 | if (assetProvider != null) | 3360 | if (assetProvider != null) |
3354 | assetProvider(_pbs.SculptTexture, MeshAssetReceived); | 3361 | assetProvider(_pbs.SculptTexture, MeshAssetReceived); |
3362 | <<<<<<< HEAD | ||
3355 | }, null, "ODEPrim.CheckMeshAsset"); | 3363 | }, null, "ODEPrim.CheckMeshAsset"); |
3364 | ======= | ||
3365 | // os version | ||
3366 | //}, null, "ODEPrim.CheckMeshAsset"); | ||
3367 | // avn | ||
3368 | }); | ||
3369 | >>>>>>> avn/ubitvar | ||
3356 | } | 3370 | } |
3357 | } | 3371 | } |
3358 | 3372 | ||