From 528cc8136e567b5bac583728fbb0235baaba2f02 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Sat, 15 Oct 2011 02:54:43 +0100 Subject: fetch physical_prim switch from [Startup] config from inside scene, as is done for most other scene config params --- OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 42 +++++----------------- 1 file changed, 8 insertions(+), 34 deletions(-) (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs') diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index b4a178e..42cc1ce 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -129,20 +129,15 @@ namespace OpenSim.Region.Framework.Scenes #region Fields public bool AllowedDrop; - public bool DIE_AT_EDGE; - public bool RETURN_AT_EDGE; - public bool BlockGrab; - public bool StatusSandbox; - public Vector3 StatusSandboxPos; [XmlIgnore] @@ -165,41 +160,29 @@ namespace OpenSim.Region.Framework.Scenes // for SL compatibility it should be persisted though (set sound / displaytext / particlesystem, kill script) public UUID Sound; - - + public byte SoundFlags; - - + public double SoundGain; - - + public double SoundRadius; - - + public uint TimeStampFull; - - + public uint TimeStampLastActivity; // Will be used for AutoReturn - - - public uint TimeStampTerse; + public uint TimeStampTerse; public UUID FromItemID; - public UUID FromFolderID; - public int STATUS_ROTATE_X; - public int STATUS_ROTATE_Y; - public int STATUS_ROTATE_Z; - - + private Dictionary m_CollisionFilter = new Dictionary(); /// @@ -216,35 +199,26 @@ namespace OpenSim.Region.Framework.Scenes public scriptEvents AggregateScriptEvents; - public Vector3 AttachedPos; - public Vector3 RotationAxis = Vector3.One; - public bool VolumeDetectActive; // XmlIgnore set to avoid problems with persistance until I come to care for this // Certainly this must be a persistant setting finally - public bool IsWaitingForFirstSpinUpdatePacket; - public Quaternion SpinOldOrientation = Quaternion.Identity; - public Quaternion m_APIDTarget = Quaternion.Identity; - public float m_APIDDamp = 0; - public float m_APIDStrength = 0; /// /// This part's inventory - /// - + /// public IEntityInventory Inventory { get { return m_inventory; } -- cgit v1.1