aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorLatif Khalifa2010-10-04 07:37:22 +0200
committerMelanie2010-10-04 06:02:09 +0100
commitcb6e4035c73c99808a4594f8229d6fca397c439c (patch)
treed9529b1b2fdd41dcda89f0225fbf3e6d2fcbfb22 /OpenSim/Region/CoreModules
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-cb6e4035c73c99808a4594f8229d6fca397c439c.zip
opensim-SC_OLD-cb6e4035c73c99808a4594f8229d6fca397c439c.tar.gz
opensim-SC_OLD-cb6e4035c73c99808a4594f8229d6fca397c439c.tar.bz2
opensim-SC_OLD-cb6e4035c73c99808a4594f8229d6fca397c439c.tar.xz
Avoid throwing errors when adding existing meshes to the render scene
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs
index a99b20c..49b4364 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs
@@ -352,6 +352,12 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
352 Face face = renderMesh.Faces[i]; 352 Face face = renderMesh.Faces[i];
353 string meshName = primID + "-Face-" + i.ToString(); 353 string meshName = primID + "-Face-" + i.ToString();
354 354
355 // Avoid adding duplicate meshes to the scene
356 if (renderer.Scene.objectData.ContainsKey(meshName))
357 {
358 continue;
359 }
360
355 warp_Object faceObj = new warp_Object(face.Vertices.Count, face.Indices.Count / 3); 361 warp_Object faceObj = new warp_Object(face.Vertices.Count, face.Indices.Count / 3);
356 362
357 for (int j = 0; j < face.Vertices.Count; j++) 363 for (int j = 0; j < face.Vertices.Count; j++)