From 1cf427886202711f163b62b4b12abb117b50ba07 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Thu, 13 Dec 2007 14:47:44 +0000
Subject: * Debugging Shape * Adding namesetting to Create

---
 OpenSim/Framework/PrimitiveBaseShape.cs               | 6 +++---
 OpenSim/Region/Environment/Scenes/Scene.cs            | 6 ------
 OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 1 +
 OpenSim/Region/Environment/Scenes/SceneObjectPart.cs  | 3 +++
 4 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 6cfc5c3..b06a885 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -104,11 +104,11 @@ namespace OpenSim.Framework
         [XmlIgnore]
         public HollowShape HollowShape
         {
-            get { return (HollowShape) (ProfileHollow & 0xf0); }
+            get { return (HollowShape)(ProfileCurve & 0xf0); }
             set
             {
-                byte oldValueMasked = (byte) (ProfileHollow & 0xf0);
-                ProfileHollow = (byte) (oldValueMasked | (byte) value);
+                byte oldValueMasked = (byte)(ProfileCurve & 0x0f);
+                ProfileCurve = (byte)(oldValueMasked | (byte)value);
             }
         }
 
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 934e425..ea67ba3 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -879,11 +879,6 @@ namespace OpenSim.Region.Environment.Scenes
             return myID;
         }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="addPacket"></param>
-        /// <param name="ownerID"></param>
         public virtual void AddNewPrim(LLUUID ownerID, LLVector3 pos, LLQuaternion rot, PrimitiveBaseShape shape)
         {
             // What we're *supposed* to do is raytrace from the camera position given by the client to the nearest collision
@@ -994,7 +989,6 @@ namespace OpenSim.Region.Environment.Scenes
         public void AddEntity(SceneObjectGroup sceneObject)
         {
             m_innerScene.AddEntity(sceneObject);
-
         }
 
         public void RemoveEntity(SceneObjectGroup sceneObject)
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index ca6e2fa..e44705c 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -589,6 +589,7 @@ namespace OpenSim.Region.Environment.Scenes
             m_parts.Add(newPart.UUID, newPart);
             SetPartAsRoot(newPart);
         }
+
         public void SetRootPartOwner(SceneObjectPart part, LLUUID cAgentID, LLUUID cGroupID)
         {
             part.LastOwnerID = part.OwnerID;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index abdbe4d..6bb00cb 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -782,6 +782,9 @@ namespace OpenSim.Region.Environment.Scenes
             PrimitiveBaseShape shape = PrimitiveBaseShape.Create();
             part.Shape = shape;
 
+            part.Name = "Primitive";
+            part.OwnerID = LLUUID.Random();
+
             return part;
         }
 
-- 
cgit v1.1