diff options
| author | UbitUmarov | 2017-01-03 11:24:16 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-03 11:24:16 +0000 |
| commit | 82a26671b8e96a4959896759e9ad250924ebedda (patch) | |
| tree | bf6f3ed18113014e2e1db611ebc1fd0c73883658 /OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs | |
| parent | some cleanup, use more using(), more checks so http request mem stream is closed (diff) | |
| parent | Merge branch 'master' of opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-82a26671b8e96a4959896759e9ad250924ebedda.zip opensim-SC-82a26671b8e96a4959896759e9ad250924ebedda.tar.gz opensim-SC-82a26671b8e96a4959896759e9ad250924ebedda.tar.bz2 opensim-SC-82a26671b8e96a4959896759e9ad250924ebedda.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs index f642699..410463c 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODEScene.cs | |||
| @@ -2267,8 +2267,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde | |||
| 2267 | 2267 | ||
| 2268 | IntPtr HeightmapData = d.GeomHeightfieldDataCreate(); | 2268 | IntPtr HeightmapData = d.GeomHeightfieldDataCreate(); |
| 2269 | 2269 | ||
| 2270 | GC.Collect(1); | ||
| 2271 | |||
| 2272 | TerrainHeightFieldHeightsHandler = GCHandle.Alloc(_heightmap, GCHandleType.Pinned); | 2270 | TerrainHeightFieldHeightsHandler = GCHandle.Alloc(_heightmap, GCHandleType.Pinned); |
| 2273 | 2271 | ||
| 2274 | d.GeomHeightfieldDataBuildSingle(HeightmapData, TerrainHeightFieldHeightsHandler.AddrOfPinnedObject(), 0, | 2272 | d.GeomHeightfieldDataBuildSingle(HeightmapData, TerrainHeightFieldHeightsHandler.AddrOfPinnedObject(), 0, |