diff options
author | Jeff Ames | 2007-11-17 08:14:17 +0000 |
---|---|---|
committer | Jeff Ames | 2007-11-17 08:14:17 +0000 |
commit | a47328973866d0cdd4503f1bcfa5da6183f0f0b0 (patch) | |
tree | 33a54285c398311f180bda6ba0469071849fdcac /OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |
parent | added some POS gravity (diff) | |
download | opensim-SC_OLD-a47328973866d0cdd4503f1bcfa5da6183f0f0b0.zip opensim-SC_OLD-a47328973866d0cdd4503f1bcfa5da6183f0f0b0.tar.gz opensim-SC_OLD-a47328973866d0cdd4503f1bcfa5da6183f0f0b0.tar.bz2 opensim-SC_OLD-a47328973866d0cdd4503f1bcfa5da6183f0f0b0.tar.xz |
minor cleanup of some dodgy bits
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 61cc973..b2e585d 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -62,7 +62,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
62 | public Int32 CreationDate; | 62 | public Int32 CreationDate; |
63 | public uint ParentID = 0; | 63 | public uint ParentID = 0; |
64 | 64 | ||
65 | |||
66 | public uint OwnerMask = FULL_MASK_PERMISSIONS; | 65 | public uint OwnerMask = FULL_MASK_PERMISSIONS; |
67 | public uint NextOwnerMask = FULL_MASK_PERMISSIONS; | 66 | public uint NextOwnerMask = FULL_MASK_PERMISSIONS; |
68 | public uint GroupMask = FULL_MASK_PERMISSIONS; | 67 | public uint GroupMask = FULL_MASK_PERMISSIONS; |
@@ -913,7 +912,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
913 | /// that's not wholesome. Had to make m_scene public | 912 | /// that's not wholesome. Had to make m_scene public |
914 | PhysActor = null; | 913 | PhysActor = null; |
915 | 914 | ||
916 | if (!((ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) != 0)) | 915 | if ((ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0) |
917 | { | 916 | { |
918 | PhysActor = m_parentGroup.m_scene.PhysScene.AddPrimShape( | 917 | PhysActor = m_parentGroup.m_scene.PhysScene.AddPrimShape( |
919 | Name, | 918 | Name, |
@@ -929,15 +928,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
929 | PhysActor.OnOutOfBounds += PhysicsOutOfBounds; | 928 | PhysActor.OnOutOfBounds += PhysicsOutOfBounds; |
930 | } | 929 | } |
931 | } | 930 | } |
932 | |||
933 | |||
934 | |||
935 | } | 931 | } |
936 | |||
937 | |||
938 | |||
939 | |||
940 | |||
941 | } | 932 | } |
942 | 933 | ||
943 | public void UpdateExtraParam(ushort type, bool inUse, byte[] data) | 934 | public void UpdateExtraParam(ushort type, bool inUse, byte[] data) |