diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/AvatarAppearance.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/AvatarAppearance.cs b/OpenSim/Region/Environment/Scenes/AvatarAppearance.cs index 1583124..b54f777 100644 --- a/OpenSim/Region/Environment/Scenes/AvatarAppearance.cs +++ b/OpenSim/Region/Environment/Scenes/AvatarAppearance.cs | |||
@@ -35,8 +35,20 @@ namespace OpenSim.Region.Environment.Scenes | |||
35 | public class AvatarAppearance | 35 | public class AvatarAppearance |
36 | { | 36 | { |
37 | protected LLUUID m_scenePresenceID; | 37 | protected LLUUID m_scenePresenceID; |
38 | |||
39 | public LLUUID ScenePresenceID | ||
40 | { | ||
41 | get { return m_scenePresenceID; } | ||
42 | set { m_scenePresenceID = value; } | ||
43 | } | ||
38 | protected int m_wearablesSerial = 1; | 44 | protected int m_wearablesSerial = 1; |
39 | 45 | ||
46 | public int WearablesSerial | ||
47 | { | ||
48 | get { return m_wearablesSerial; } | ||
49 | set { m_wearablesSerial = value; } | ||
50 | } | ||
51 | |||
40 | protected byte[] m_visualParams; | 52 | protected byte[] m_visualParams; |
41 | 53 | ||
42 | public byte[] VisualParams | 54 | public byte[] VisualParams |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 043b094..159eaf1 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -72,6 +72,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
72 | 72 | ||
73 | public partial class SceneObjectPart : IScriptHost | 73 | public partial class SceneObjectPart : IScriptHost |
74 | { | 74 | { |
75 | |||
75 | [XmlIgnore] public PhysicsActor PhysActor = null; | 76 | [XmlIgnore] public PhysicsActor PhysActor = null; |
76 | 77 | ||
77 | public LLUUID LastOwnerID; | 78 | public LLUUID LastOwnerID; |
@@ -764,11 +765,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
764 | 765 | ||
765 | public void TrimPermissions() | 766 | public void TrimPermissions() |
766 | { | 767 | { |
768 | |||
767 | BaseMask &= (uint)PermissionMask.All; | 769 | BaseMask &= (uint)PermissionMask.All; |
768 | OwnerMask &= (uint)PermissionMask.All; | 770 | OwnerMask &= (uint)PermissionMask.All; |
769 | GroupMask &= (uint)PermissionMask.All; | 771 | GroupMask &= (uint)PermissionMask.All; |
770 | EveryoneMask &= (uint)PermissionMask.All; | 772 | EveryoneMask &= (uint)PermissionMask.All; |
771 | NextOwnerMask &= (uint)PermissionMask.All; | 773 | NextOwnerMask &= (uint)PermissionMask.All; |
774 | |||
772 | } | 775 | } |
773 | 776 | ||
774 | /// <summary> | 777 | /// <summary> |