diff options
author | UbitUmarov | 2012-02-26 17:51:43 +0000 |
---|---|---|
committer | UbitUmarov | 2012-02-26 17:51:43 +0000 |
commit | 118986f15078a1df5561a64355e6f4777ae74fe1 (patch) | |
tree | 63becf0eda2470b2dcfebc230ce11dae38184575 /OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | |
parent | Implement KeyframedMotion selection behavior (diff) | |
download | opensim-SC-118986f15078a1df5561a64355e6f4777ae74fe1.zip opensim-SC-118986f15078a1df5561a64355e6f4777ae74fe1.tar.gz opensim-SC-118986f15078a1df5561a64355e6f4777ae74fe1.tar.bz2 opensim-SC-118986f15078a1df5561a64355e6f4777ae74fe1.tar.xz |
added in chODE GeomTriMeshDataDestroy to explicity release internal trimesh data.
Diffstat (limited to 'OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs')
-rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs index 61fb2d0..f84918c 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | |||
@@ -2174,6 +2174,16 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2174 | { | 2174 | { |
2175 | prim.ResetTaints(); | 2175 | prim.ResetTaints(); |
2176 | 2176 | ||
2177 | try | ||
2178 | { | ||
2179 | if (prim._triMeshData != IntPtr.Zero) | ||
2180 | { | ||
2181 | d.GeomTriMeshDataDestroy(prim._triMeshData); | ||
2182 | prim._triMeshData = IntPtr.Zero; | ||
2183 | } | ||
2184 | } | ||
2185 | catch { }; | ||
2186 | |||
2177 | if (prim.IsPhysical) | 2187 | if (prim.IsPhysical) |
2178 | { | 2188 | { |
2179 | prim.disableBody(); | 2189 | prim.disableBody(); |
@@ -2185,7 +2195,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2185 | prim.IsPhysical = false; | 2195 | prim.IsPhysical = false; |
2186 | } | 2196 | } |
2187 | 2197 | ||
2188 | |||
2189 | } | 2198 | } |
2190 | // we don't want to remove the main space | 2199 | // we don't want to remove the main space |
2191 | 2200 | ||