OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Debugging Shape 

* Adding namesetting to Create
afrisby
lbsa71 2007-12-13 14:47:44 +00:00
parent 83ca8bd178
commit 1cf4278862
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/PrimitiveBaseShape.cs
View File

@ -104,11 +104,11 @@ namespace OpenSim.Framework
[XmlIgnore] [XmlIgnore]
public HollowShape HollowShape public HollowShape HollowShape
{ {
get { return (HollowShape) (ProfileHollow & 0xf0); } get { return (HollowShape)(ProfileCurve & 0xf0); }
set set
{ {
byte oldValueMasked = (byte) (ProfileHollow & 0xf0); byte oldValueMasked = (byte)(ProfileCurve & 0x0f);
ProfileHollow = (byte) (oldValueMasked | (byte) value); ProfileCurve = (byte)(oldValueMasked | (byte)value);
} }
} }

6
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -879,11 +879,6 @@ namespace OpenSim.Region.Environment.Scenes
return myID; return myID;
} }
/// <summary>
///
/// </summary>
/// <param name="addPacket"></param>
/// <param name="ownerID"></param>
public virtual void AddNewPrim(LLUUID ownerID, LLVector3 pos, LLQuaternion rot, PrimitiveBaseShape shape) 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 // 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) public void AddEntity(SceneObjectGroup sceneObject)
{ {
m_innerScene.AddEntity(sceneObject); m_innerScene.AddEntity(sceneObject);
} }
public void RemoveEntity(SceneObjectGroup sceneObject) public void RemoveEntity(SceneObjectGroup sceneObject)

1
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -589,6 +589,7 @@ namespace OpenSim.Region.Environment.Scenes
m_parts.Add(newPart.UUID, newPart); m_parts.Add(newPart.UUID, newPart);
SetPartAsRoot(newPart); SetPartAsRoot(newPart);
} }
public void SetRootPartOwner(SceneObjectPart part, LLUUID cAgentID, LLUUID cGroupID) public void SetRootPartOwner(SceneObjectPart part, LLUUID cAgentID, LLUUID cGroupID)
{ {
part.LastOwnerID = part.OwnerID; part.LastOwnerID = part.OwnerID;

3
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -782,6 +782,9 @@ namespace OpenSim.Region.Environment.Scenes
PrimitiveBaseShape shape = PrimitiveBaseShape.Create(); PrimitiveBaseShape shape = PrimitiveBaseShape.Create();
part.Shape = shape; part.Shape = shape;
part.Name = "Primitive";
part.OwnerID = LLUUID.Random();
return part; return part;
} }