diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs index 0cdaa60..5d2b1f7 100644 --- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs +++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Mesh.cs | |||
| @@ -243,8 +243,8 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing | |||
| 243 | triangle.v3.Z) | 243 | triangle.v3.Z) |
| 244 | || (triangle.v2.X == triangle.v3.X && triangle.v2.Y == triangle.v3.Y && triangle.v2.Z == | 244 | || (triangle.v2.X == triangle.v3.X && triangle.v2.Y == triangle.v3.Y && triangle.v2.Z == |
| 245 | triangle.v3.Z) | 245 | triangle.v3.Z) |
| 246 | ) | 246 | ) |
| 247 | { | 247 | { |
| 248 | return; | 248 | return; |
| 249 | } | 249 | } |
| 250 | 250 | ||
| @@ -444,7 +444,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing | |||
| 444 | { | 444 | { |
| 445 | if (m_indicesPtr != IntPtr.Zero || m_verticesPtr != IntPtr.Zero) | 445 | if (m_indicesPtr != IntPtr.Zero || m_verticesPtr != IntPtr.Zero) |
| 446 | throw new NotSupportedException("Attempt to Append to a pinned Mesh"); | 446 | throw new NotSupportedException("Attempt to Append to a pinned Mesh"); |
| 447 | 447 | ||
| 448 | if (!(newMesh is Mesh)) | 448 | if (!(newMesh is Mesh)) |
| 449 | return; | 449 | return; |
| 450 | 450 | ||