diff options
-rw-r--r-- | OpenSim/Framework/PrimitiveBaseShape.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 3 |
4 files changed, 7 insertions, 9 deletions
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 | |||
104 | [XmlIgnore] | 104 | [XmlIgnore] |
105 | public HollowShape HollowShape | 105 | public HollowShape HollowShape |
106 | { | 106 | { |
107 | get { return (HollowShape) (ProfileHollow & 0xf0); } | 107 | get { return (HollowShape)(ProfileCurve & 0xf0); } |
108 | set | 108 | set |
109 | { | 109 | { |
110 | byte oldValueMasked = (byte) (ProfileHollow & 0xf0); | 110 | byte oldValueMasked = (byte)(ProfileCurve & 0x0f); |
111 | ProfileHollow = (byte) (oldValueMasked | (byte) value); | 111 | ProfileCurve = (byte)(oldValueMasked | (byte)value); |
112 | } | 112 | } |
113 | } | 113 | } |
114 | 114 | ||
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 | |||
879 | return myID; | 879 | return myID; |
880 | } | 880 | } |
881 | 881 | ||
882 | /// <summary> | ||
883 | /// | ||
884 | /// </summary> | ||
885 | /// <param name="addPacket"></param> | ||
886 | /// <param name="ownerID"></param> | ||
887 | public virtual void AddNewPrim(LLUUID ownerID, LLVector3 pos, LLQuaternion rot, PrimitiveBaseShape shape) | 882 | public virtual void AddNewPrim(LLUUID ownerID, LLVector3 pos, LLQuaternion rot, PrimitiveBaseShape shape) |
888 | { | 883 | { |
889 | // What we're *supposed* to do is raytrace from the camera position given by the client to the nearest collision | 884 | // 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 | |||
994 | public void AddEntity(SceneObjectGroup sceneObject) | 989 | public void AddEntity(SceneObjectGroup sceneObject) |
995 | { | 990 | { |
996 | m_innerScene.AddEntity(sceneObject); | 991 | m_innerScene.AddEntity(sceneObject); |
997 | |||
998 | } | 992 | } |
999 | 993 | ||
1000 | public void RemoveEntity(SceneObjectGroup sceneObject) | 994 | 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 | |||
589 | m_parts.Add(newPart.UUID, newPart); | 589 | m_parts.Add(newPart.UUID, newPart); |
590 | SetPartAsRoot(newPart); | 590 | SetPartAsRoot(newPart); |
591 | } | 591 | } |
592 | |||
592 | public void SetRootPartOwner(SceneObjectPart part, LLUUID cAgentID, LLUUID cGroupID) | 593 | public void SetRootPartOwner(SceneObjectPart part, LLUUID cAgentID, LLUUID cGroupID) |
593 | { | 594 | { |
594 | part.LastOwnerID = part.OwnerID; | 595 | 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 | |||
782 | PrimitiveBaseShape shape = PrimitiveBaseShape.Create(); | 782 | PrimitiveBaseShape shape = PrimitiveBaseShape.Create(); |
783 | part.Shape = shape; | 783 | part.Shape = shape; |
784 | 784 | ||
785 | part.Name = "Primitive"; | ||
786 | part.OwnerID = LLUUID.Random(); | ||
787 | |||
785 | return part; | 788 | return part; |
786 | } | 789 | } |
787 | 790 | ||