Merge branch 'master' of git://opensimulator.org/git/opensim

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
                 Face face = renderMesh.Faces[i];
                 string meshName = primID + "-Face-" + i.ToString();
 
+                // Avoid adding duplicate meshes to the scene
+                if (renderer.Scene.objectData.ContainsKey(meshName))
+                {
+                    continue;
+                }
+
                 warp_Object faceObj = new warp_Object(face.Vertices.Count, face.Indices.Count / 3);
 
                 for (int j = 0; j < face.Vertices.Count; j++)