diff options
author | lbsa71 | 2007-10-30 09:05:31 +0000 |
---|---|---|
committer | lbsa71 | 2007-10-30 09:05:31 +0000 |
commit | 67e12b95ea7b68f4904a7484d77ecfd787d16d0c (patch) | |
tree | 20b00d24c8a7617017960432ec044852e3ad5fa9 /OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |
parent | * Deleted .user file (diff) | |
download | opensim-SC_OLD-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.zip opensim-SC_OLD-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.tar.gz opensim-SC_OLD-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.tar.bz2 opensim-SC_OLD-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.tar.xz |
* Optimized usings
* Shortened type references
* Removed redundant 'this' qualifier
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 3e104e3..387f573 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -33,12 +33,10 @@ using System.Xml.Serialization; | |||
33 | using Axiom.Math; | 33 | using Axiom.Math; |
34 | using libsecondlife; | 34 | using libsecondlife; |
35 | using libsecondlife.Packets; | 35 | using libsecondlife.Packets; |
36 | using OpenSim.Framework.Interfaces; | ||
37 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
38 | using OpenSim.Region.Environment.Interfaces; | 37 | using OpenSim.Region.Environment.Interfaces; |
39 | using OpenSim.Region.Environment.Scenes.Scripting; | 38 | using OpenSim.Region.Environment.Scenes.Scripting; |
40 | using OpenSim.Region.Physics.Manager; | 39 | using OpenSim.Region.Physics.Manager; |
41 | using OpenSim.Region.Environment.Types; | ||
42 | 40 | ||
43 | namespace OpenSim.Region.Environment.Scenes | 41 | namespace OpenSim.Region.Environment.Scenes |
44 | { | 42 | { |
@@ -49,8 +47,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
49 | private string m_inventoryFileName = ""; | 47 | private string m_inventoryFileName = ""; |
50 | private LLUUID m_folderID = LLUUID.Zero; | 48 | private LLUUID m_folderID = LLUUID.Zero; |
51 | 49 | ||
52 | [XmlIgnore] | 50 | [XmlIgnore] public PhysicsActor PhysActor = null; |
53 | public PhysicsActor PhysActor = null; | ||
54 | 51 | ||
55 | protected Dictionary<LLUUID, TaskInventoryItem> TaskInventory = new Dictionary<LLUUID, TaskInventoryItem>(); | 52 | protected Dictionary<LLUUID, TaskInventoryItem> TaskInventory = new Dictionary<LLUUID, TaskInventoryItem>(); |
56 | 53 | ||
@@ -68,10 +65,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
68 | 65 | ||
69 | protected byte[] m_particleSystem = new byte[0]; | 66 | protected byte[] m_particleSystem = new byte[0]; |
70 | 67 | ||
71 | [XmlIgnore] | 68 | [XmlIgnore] public uint TimeStampFull = 0; |
72 | public uint TimeStampFull = 0; | 69 | [XmlIgnore] public uint TimeStampTerse = 0; |
73 | [XmlIgnore] | ||
74 | public uint TimeStampTerse = 0; | ||
75 | 70 | ||
76 | protected SceneObjectGroup m_parentGroup; | 71 | protected SceneObjectGroup m_parentGroup; |
77 | 72 | ||
@@ -124,7 +119,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
124 | set { m_name = value; } | 119 | set { m_name = value; } |
125 | } | 120 | } |
126 | 121 | ||
127 | protected LLObject.ObjectFlags m_flags =0; | 122 | protected LLObject.ObjectFlags m_flags = 0; |
128 | 123 | ||
129 | public uint ObjectFlags | 124 | public uint ObjectFlags |
130 | { | 125 | { |
@@ -132,7 +127,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
132 | set { m_flags = (LLObject.ObjectFlags) value; } | 127 | set { m_flags = (LLObject.ObjectFlags) value; } |
133 | } | 128 | } |
134 | 129 | ||
135 | protected LLObject.MaterialType m_material =0; | 130 | protected LLObject.MaterialType m_material = 0; |
136 | 131 | ||
137 | public byte Material | 132 | public byte Material |
138 | { | 133 | { |
@@ -712,7 +707,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
712 | List<ScenePresence> avatars = m_parentGroup.GetScenePresences(); | 707 | List<ScenePresence> avatars = m_parentGroup.GetScenePresences(); |
713 | for (int i = 0; i < avatars.Count; i++) | 708 | for (int i = 0; i < avatars.Count; i++) |
714 | { | 709 | { |
715 | avatars[i].QueuePartForUpdate(this); | 710 | avatars[i].QueuePartForUpdate(this); |
716 | } | 711 | } |
717 | } | 712 | } |
718 | 713 | ||
@@ -774,13 +769,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
774 | List<ScenePresence> avatars = m_parentGroup.GetScenePresences(); | 769 | List<ScenePresence> avatars = m_parentGroup.GetScenePresences(); |
775 | for (int i = 0; i < avatars.Count; i++) | 770 | for (int i = 0; i < avatars.Count; i++) |
776 | { | 771 | { |
777 | avatars[i].QueuePartForUpdate(this); | 772 | avatars[i].QueuePartForUpdate(this); |
778 | } | 773 | } |
779 | } | 774 | } |
780 | 775 | ||
781 | public void AddTerseUpdateToAvatar(ScenePresence presence) | 776 | public void AddTerseUpdateToAvatar(ScenePresence presence) |
782 | { | 777 | { |
783 | presence.QueuePartForUpdate(this); | 778 | presence.QueuePartForUpdate(this); |
784 | } | 779 | } |
785 | 780 | ||
786 | /// <summary> | 781 | /// <summary> |
@@ -927,4 +922,4 @@ namespace OpenSim.Region.Environment.Scenes | |||
927 | } | 922 | } |
928 | } | 923 | } |
929 | } | 924 | } |
930 | } | 925 | } \ No newline at end of file |