diff options
Update svn properties, formatting cleanup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs index 996badf..6bbc30c 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs | |||
@@ -58,8 +58,8 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
58 | { | 58 | { |
59 | #region Fields | 59 | #region Fields |
60 | 60 | ||
61 | // private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 61 | // private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
62 | // Any ContentManagementEntities that represent old versions of current SceneObjectGroups or | 62 | // Any ContentManagementEntities that represent old versions of current SceneObjectGroups or |
63 | // old versions of deleted SceneObjectGroups will be stored in this hash table. | 63 | // old versions of deleted SceneObjectGroups will be stored in this hash table. |
64 | // The UUID keys are from the SceneObjectGroup RootPart UUIDs | 64 | // The UUID keys are from the SceneObjectGroup RootPart UUIDs |
65 | protected Hashtable m_CMEntityHash = Hashtable.Synchronized(new Hashtable()); //UUID to ContentManagementEntity | 65 | protected Hashtable m_CMEntityHash = Hashtable.Synchronized(new Hashtable()); //UUID to ContentManagementEntity |
@@ -97,7 +97,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
97 | public bool AddAura(ContentManagementEntity aura) | 97 | public bool AddAura(ContentManagementEntity aura) |
98 | { | 98 | { |
99 | if (m_NewlyCreatedEntityAura.ContainsKey(aura.UUID)) | 99 | if (m_NewlyCreatedEntityAura.ContainsKey(aura.UUID)) |
100 | return false; | 100 | return false; |
101 | m_NewlyCreatedEntityAura.Add(aura.UUID, aura); | 101 | m_NewlyCreatedEntityAura.Add(aura.UUID, aura); |
102 | return true; | 102 | return true; |
103 | } | 103 | } |
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
105 | public bool AddEntity(ContentManagementEntity ent) | 105 | public bool AddEntity(ContentManagementEntity ent) |
106 | { | 106 | { |
107 | if (m_CMEntityHash.ContainsKey(ent.UUID)) | 107 | if (m_CMEntityHash.ContainsKey(ent.UUID)) |
108 | return false; | 108 | return false; |
109 | m_CMEntityHash.Add(ent.UUID, ent); | 109 | m_CMEntityHash.Add(ent.UUID, ent); |
110 | return true; | 110 | return true; |
111 | } | 111 | } |
@@ -115,23 +115,23 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
115 | { | 115 | { |
116 | System.Collections.ArrayList missingList = new System.Collections.ArrayList(); | 116 | System.Collections.ArrayList missingList = new System.Collections.ArrayList(); |
117 | SceneObjectGroup temp = null; | 117 | SceneObjectGroup temp = null; |
118 | foreach( EntityBase currObj in currList ) | 118 | foreach (EntityBase currObj in currList) |
119 | { | 119 | { |
120 | if (! (currObj is SceneObjectGroup)) | 120 | if (!(currObj is SceneObjectGroup)) |
121 | continue; | 121 | continue; |
122 | temp = (SceneObjectGroup) currObj; | 122 | temp = (SceneObjectGroup) currObj; |
123 | 123 | ||
124 | if (m_CMEntityHash.ContainsKey(temp.UUID)) | 124 | if (m_CMEntityHash.ContainsKey(temp.UUID)) |
125 | { | 125 | { |
126 | foreach(SceneObjectPart part in temp.Children.Values) | 126 | foreach (SceneObjectPart part in temp.Children.Values) |
127 | if (!((ContentManagementEntity)m_CMEntityHash[temp.UUID]).HasChildPrim(part.UUID)) | 127 | if (!((ContentManagementEntity)m_CMEntityHash[temp.UUID]).HasChildPrim(part.UUID)) |
128 | missingList.Add(part); | 128 | missingList.Add(part); |
129 | } | 129 | } |
130 | else //Entire group is missing from revision. (and is a new part in region) | 130 | else //Entire group is missing from revision. (and is a new part in region) |
131 | { | 131 | { |
132 | foreach(SceneObjectPart part in temp.Children.Values) | 132 | foreach (SceneObjectPart part in temp.Children.Values) |
133 | missingList.Add(part); | 133 | missingList.Add(part); |
134 | } | 134 | } |
135 | } | 135 | } |
136 | return missingList; | 136 | return missingList; |
137 | } | 137 | } |
@@ -146,9 +146,9 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
146 | public AuraMetaEntity CreateAuraForNewlyCreatedEntity(SceneObjectPart part) | 146 | public AuraMetaEntity CreateAuraForNewlyCreatedEntity(SceneObjectPart part) |
147 | { | 147 | { |
148 | AuraMetaEntity ent = new AuraMetaEntity(part.ParentGroup.Scene, | 148 | AuraMetaEntity ent = new AuraMetaEntity(part.ParentGroup.Scene, |
149 | part.ParentGroup.Scene.PrimIDAllocate(), | 149 | part.ParentGroup.Scene.PrimIDAllocate(), |
150 | part.GetWorldPosition(), | 150 | part.GetWorldPosition(), |
151 | MetaEntity.TRANSLUCENT, | 151 | MetaEntity.TRANSLUCENT, |
152 | new Vector3(0,254,0), | 152 | new Vector3(0,254,0), |
153 | part.Scale | 153 | part.Scale |
154 | ); | 154 | ); |
@@ -168,7 +168,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
168 | { | 168 | { |
169 | ContentManagementEntity ent = new ContentManagementEntity(xml, scene, false); | 169 | ContentManagementEntity ent = new ContentManagementEntity(xml, scene, false); |
170 | if (ent == null) | 170 | if (ent == null) |
171 | return null; | 171 | return null; |
172 | m_CMEntityHash.Add(ent.UnchangedEntity.UUID, ent); | 172 | m_CMEntityHash.Add(ent.UnchangedEntity.UUID, ent); |
173 | return ent; | 173 | return ent; |
174 | } | 174 | } |
@@ -176,7 +176,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
176 | public bool RemoveEntity(UUID uuid) | 176 | public bool RemoveEntity(UUID uuid) |
177 | { | 177 | { |
178 | if (!m_CMEntityHash.ContainsKey(uuid)) | 178 | if (!m_CMEntityHash.ContainsKey(uuid)) |
179 | return false; | 179 | return false; |
180 | m_CMEntityHash.Remove(uuid); | 180 | m_CMEntityHash.Remove(uuid); |
181 | return true; | 181 | return true; |
182 | } | 182 | } |
@@ -184,7 +184,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
184 | public bool RemoveNewlyCreatedEntityAura(UUID uuid) | 184 | public bool RemoveNewlyCreatedEntityAura(UUID uuid) |
185 | { | 185 | { |
186 | if (!m_NewlyCreatedEntityAura.ContainsKey(uuid)) | 186 | if (!m_NewlyCreatedEntityAura.ContainsKey(uuid)) |
187 | return false; | 187 | return false; |
188 | m_NewlyCreatedEntityAura.Remove(uuid); | 188 | m_NewlyCreatedEntityAura.Remove(uuid); |
189 | return true; | 189 | return true; |
190 | } | 190 | } |