aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index c6b3059..4b174e3 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -85,7 +85,6 @@ namespace OpenSim.Region.Environment.Scenes
85 [Serializable] 85 [Serializable]
86 public partial class SceneObjectPart : IScriptHost, ISerializable 86 public partial class SceneObjectPart : IScriptHost, ISerializable
87 { 87 {
88
89 [XmlIgnore] public PhysicsActor PhysActor = null; 88 [XmlIgnore] public PhysicsActor PhysActor = null;
90 89
91 public LLUUID LastOwnerID; 90 public LLUUID LastOwnerID;
@@ -103,7 +102,6 @@ namespace OpenSim.Region.Environment.Scenes
103 [XmlIgnore] private LLObject.ObjectFlags LocalFlags = LLObject.ObjectFlags.None; 102 [XmlIgnore] private LLObject.ObjectFlags LocalFlags = LLObject.ObjectFlags.None;
104 [XmlIgnore] public bool DIE_AT_EDGE = false; 103 [XmlIgnore] public bool DIE_AT_EDGE = false;
105 104
106
107 [XmlIgnore] public bool m_IsAttachment = false; 105 [XmlIgnore] public bool m_IsAttachment = false;
108 [XmlIgnore] public uint m_attachmentPoint = (byte)0; 106 [XmlIgnore] public uint m_attachmentPoint = (byte)0;
109 [XmlIgnore] public LLUUID m_attachedAvatar = LLUUID.Zero; 107 [XmlIgnore] public LLUUID m_attachedAvatar = LLUUID.Zero;
@@ -700,7 +698,6 @@ namespace OpenSim.Region.Environment.Scenes
700 get { return m_shape; } 698 get { return m_shape; }
701 set 699 set
702 { 700 {
703
704 m_shape = value; 701 m_shape = value;
705 TriggerScriptChangedEvent(Changed.SHAPE); 702 TriggerScriptChangedEvent(Changed.SHAPE);
706 } 703 }
@@ -1949,6 +1946,7 @@ namespace OpenSim.Region.Environment.Scenes
1949 public void UpdateExtraParam(ushort type, bool inUse, byte[] data) 1946 public void UpdateExtraParam(ushort type, bool inUse, byte[] data)
1950 { 1947 {
1951 m_shape.ReadInUpdateExtraParam(type, inUse, data); 1948 m_shape.ReadInUpdateExtraParam(type, inUse, data);
1949
1952 if (type == 0x30) 1950 if (type == 0x30)
1953 { 1951 {
1954 if (m_shape.SculptEntry && m_shape.SculptTexture != LLUUID.Zero) 1952 if (m_shape.SculptEntry && m_shape.SculptTexture != LLUUID.Zero)
@@ -1957,9 +1955,10 @@ namespace OpenSim.Region.Environment.Scenes
1957 m_parentGroup.Scene.AssetCache.GetAsset(m_shape.SculptTexture, SculptTextureCallback, true); 1955 m_parentGroup.Scene.AssetCache.GetAsset(m_shape.SculptTexture, SculptTextureCallback, true);
1958 } 1956 }
1959 } 1957 }
1958
1960 ScheduleFullUpdate(); 1959 ScheduleFullUpdate();
1961
1962 } 1960 }
1961
1963 public void SculptTextureCallback(LLUUID textureID, AssetBase texture) 1962 public void SculptTextureCallback(LLUUID textureID, AssetBase texture)
1964 { 1963 {
1965 if (m_shape.SculptEntry) 1964 if (m_shape.SculptEntry)