parent
83ca8bd178
commit
1cf4278862
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue