Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmerge

Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-10-11 22:53:27 +01:00 · 2011-10-11 22:53:27 +01:00 · 83ec064868
parent 1b2849319c bec0cbe82b
commit 83ec064868
1 changed files with 0 additions and 14 deletions
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@ -1769,20 +1769,6 @@ namespace OpenSim.Region.Framework.Scenes
                    Name, LocalId, id);
        }

-        public static SceneObjectPart Create()
-        {
-            SceneObjectPart part = new SceneObjectPart();
-            part.UUID = UUID.Random();
-
-            PrimitiveBaseShape shape = PrimitiveBaseShape.Create();
-            part.Shape = shape;
-
-            part.Name = "Object";
-            part._ownerID = UUID.Random();
-
-            return part;
-        }
-
        /// <summary>
        /// Do a physics property update for a NINJA joint.
        /// </summary>