diff options
author | BlueWall | 2012-11-25 17:03:14 -0500 |
---|---|---|
committer | BlueWall | 2012-11-25 17:03:14 -0500 |
commit | c754003944d0166bf50b4f94b0c0eea642503bb0 (patch) | |
tree | dfa1c2020d5500d510519d5b2b3236600692f277 /OpenSim/Region/Physics/OdePlugin | |
parent | Merge branch 'master' into connector_plugin (diff) | |
parent | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff) | |
download | opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.zip opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2 opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz |
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 16 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 13 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs | 3 |
4 files changed, 28 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs index d65929a..3c4f06a 100644 --- a/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs +++ b/OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs | |||
@@ -39,7 +39,7 @@ using System.Runtime.InteropServices; | |||
39 | [assembly : AssemblyConfiguration("")] | 39 | [assembly : AssemblyConfiguration("")] |
40 | [assembly : AssemblyCompany("http://opensimulator.org")] | 40 | [assembly : AssemblyCompany("http://opensimulator.org")] |
41 | [assembly : AssemblyProduct("OdePlugin")] | 41 | [assembly : AssemblyProduct("OdePlugin")] |
42 | [assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")] | 42 | [assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers")] |
43 | [assembly : AssemblyTrademark("")] | 43 | [assembly : AssemblyTrademark("")] |
44 | [assembly : AssemblyCulture("")] | 44 | [assembly : AssemblyCulture("")] |
45 | 45 | ||
@@ -55,4 +55,4 @@ using System.Runtime.InteropServices; | |||
55 | // You can specify all values by your own or you can build default build and revision | 55 | // You can specify all values by your own or you can build default build and revision |
56 | // numbers with the '*' character (the default): | 56 | // numbers with the '*' character (the default): |
57 | 57 | ||
58 | [assembly : AssemblyVersion("0.6.5.*")] | 58 | [assembly : AssemblyVersion("0.7.5.*")] |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index c736557..319f6ab 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
@@ -661,6 +661,20 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
661 | set { return; } | 661 | set { return; } |
662 | } | 662 | } |
663 | 663 | ||
664 | public override Vector3 TargetVelocity | ||
665 | { | ||
666 | get | ||
667 | { | ||
668 | return m_taintTargetVelocity; | ||
669 | } | ||
670 | |||
671 | set | ||
672 | { | ||
673 | Velocity = value; | ||
674 | } | ||
675 | } | ||
676 | |||
677 | |||
664 | public override Vector3 Velocity | 678 | public override Vector3 Velocity |
665 | { | 679 | { |
666 | get | 680 | get |
@@ -1394,4 +1408,4 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1394 | m_eventsubscription += p; | 1408 | m_eventsubscription += p; |
1395 | } | 1409 | } |
1396 | } | 1410 | } |
1397 | } \ No newline at end of file | 1411 | } |
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 2548648..5a0b8d1 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -3335,7 +3335,6 @@ Console.WriteLine(" JointCreateFixed"); | |||
3335 | m_material = pMaterial; | 3335 | m_material = pMaterial; |
3336 | } | 3336 | } |
3337 | 3337 | ||
3338 | |||
3339 | private void CheckMeshAsset() | 3338 | private void CheckMeshAsset() |
3340 | { | 3339 | { |
3341 | if (_pbs.SculptEntry && !m_assetFailed && _pbs.SculptTexture != UUID.Zero) | 3340 | if (_pbs.SculptEntry && !m_assetFailed && _pbs.SculptTexture != UUID.Zero) |
@@ -3345,14 +3344,14 @@ Console.WriteLine(" JointCreateFixed"); | |||
3345 | { | 3344 | { |
3346 | RequestAssetDelegate assetProvider = _parent_scene.RequestAssetMethod; | 3345 | RequestAssetDelegate assetProvider = _parent_scene.RequestAssetMethod; |
3347 | if (assetProvider != null) | 3346 | if (assetProvider != null) |
3348 | assetProvider(_pbs.SculptTexture, MeshAssetReveived); | 3347 | assetProvider(_pbs.SculptTexture, MeshAssetReceived); |
3349 | }); | 3348 | }); |
3350 | } | 3349 | } |
3351 | } | 3350 | } |
3352 | 3351 | ||
3353 | void MeshAssetReveived(AssetBase asset) | 3352 | private void MeshAssetReceived(AssetBase asset) |
3354 | { | 3353 | { |
3355 | if (asset.Data != null && asset.Data.Length > 0) | 3354 | if (asset != null && asset.Data != null && asset.Data.Length > 0) |
3356 | { | 3355 | { |
3357 | if (!_pbs.SculptEntry) | 3356 | if (!_pbs.SculptEntry) |
3358 | return; | 3357 | return; |
@@ -3365,6 +3364,12 @@ Console.WriteLine(" JointCreateFixed"); | |||
3365 | m_taintshape = true; | 3364 | m_taintshape = true; |
3366 | _parent_scene.AddPhysicsActorTaint(this); | 3365 | _parent_scene.AddPhysicsActorTaint(this); |
3367 | } | 3366 | } |
3367 | else | ||
3368 | { | ||
3369 | m_log.WarnFormat( | ||
3370 | "[ODE PRIM]: Could not get mesh/sculpt asset {0} for {1} at {2} in {3}", | ||
3371 | _pbs.SculptTexture, Name, _position, _parent_scene.Name); | ||
3372 | } | ||
3368 | } | 3373 | } |
3369 | } | 3374 | } |
3370 | } \ No newline at end of file | 3375 | } \ No newline at end of file |
diff --git a/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs b/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs index cbc6b95..16404c6 100644 --- a/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs +++ b/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs | |||
@@ -32,13 +32,14 @@ using OpenMetaverse; | |||
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.Physics.Manager; | 33 | using OpenSim.Region.Physics.Manager; |
34 | using OpenSim.Region.Physics.OdePlugin; | 34 | using OpenSim.Region.Physics.OdePlugin; |
35 | using OpenSim.Tests.Common; | ||
35 | using log4net; | 36 | using log4net; |
36 | using System.Reflection; | 37 | using System.Reflection; |
37 | 38 | ||
38 | namespace OpenSim.Region.Physics.OdePlugin.Tests | 39 | namespace OpenSim.Region.Physics.OdePlugin.Tests |
39 | { | 40 | { |
40 | [TestFixture] | 41 | [TestFixture] |
41 | public class ODETestClass | 42 | public class ODETestClass : OpenSimTestCase |
42 | { | 43 | { |
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | 45 | ||