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

This commit is contained in:
Jonathan Freedman
2010-10-05 14:17:18 -04:00
45 changed files with 28159 additions and 27668 deletions

View File

@@ -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++)