Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.csavinationmerge
commit
83ec064868
|
@ -1769,20 +1769,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
Name, LocalId, id);
|
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>
|
/// <summary>
|
||||||
/// Do a physics property update for a NINJA joint.
|
/// Do a physics property update for a NINJA joint.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
Loading…
Reference in New Issue