diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs index 90ef6ef..88f4a67 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs | |||
@@ -78,46 +78,46 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
78 | // Auras To | 78 | // Auras To |
79 | public void DisplayAuras(CMEntityCollection auraCollection) | 79 | public void DisplayAuras(CMEntityCollection auraCollection) |
80 | { | 80 | { |
81 | foreach( Object ent in auraCollection.Auras.Values) | 81 | foreach (Object ent in auraCollection.Auras.Values) |
82 | ((AuraMetaEntity)ent).SendFullUpdateToAll(); | 82 | ((AuraMetaEntity)ent).SendFullUpdateToAll(); |
83 | } | 83 | } |
84 | 84 | ||
85 | // Auras To Client | 85 | // Auras To Client |
86 | public void DisplayAuras(CMEntityCollection auraCollection, IClientAPI client) | 86 | public void DisplayAuras(CMEntityCollection auraCollection, IClientAPI client) |
87 | { | 87 | { |
88 | foreach( Object ent in auraCollection.Auras.Values) | 88 | foreach (Object ent in auraCollection.Auras.Values) |
89 | ((AuraMetaEntity)ent).SendFullUpdate(client); | 89 | ((AuraMetaEntity)ent).SendFullUpdate(client); |
90 | } | 90 | } |
91 | 91 | ||
92 | // Auras from List To ALL | 92 | // Auras from List To ALL |
93 | public void DisplayAuras(ArrayList list) | 93 | public void DisplayAuras(ArrayList list) |
94 | { | 94 | { |
95 | foreach( Object ent in list) | 95 | foreach (Object ent in list) |
96 | { | 96 | { |
97 | m_log.Debug("[CONTENT MANAGEMENT] displaying new aura riiiiiiiiiiiight NOW"); | 97 | m_log.Debug("[CONTENT MANAGEMENT] displaying new aura riiiiiiiiiiiight NOW"); |
98 | ((AuraMetaEntity)ent).SendFullUpdateToAll(); | 98 | ((AuraMetaEntity)ent).SendFullUpdateToAll(); |
99 | } | 99 | } |
100 | } | 100 | } |
101 | 101 | ||
102 | // Entities to ALL | 102 | // Entities to ALL |
103 | public void DisplayEntities(CMEntityCollection entityCollection) | 103 | public void DisplayEntities(CMEntityCollection entityCollection) |
104 | { | 104 | { |
105 | foreach( Object ent in entityCollection.Entities.Values) | 105 | foreach (Object ent in entityCollection.Entities.Values) |
106 | ((ContentManagementEntity)ent).SendFullDiffUpdateToAll(); | 106 | ((ContentManagementEntity)ent).SendFullDiffUpdateToAll(); |
107 | } | 107 | } |
108 | 108 | ||
109 | // Entities to Client | 109 | // Entities to Client |
110 | public void DisplayEntities(CMEntityCollection entityCollection, IClientAPI client) | 110 | public void DisplayEntities(CMEntityCollection entityCollection, IClientAPI client) |
111 | { | 111 | { |
112 | foreach( Object ent in entityCollection.Entities.Values) | 112 | foreach (Object ent in entityCollection.Entities.Values) |
113 | ((ContentManagementEntity)ent).SendFullDiffUpdate(client); | 113 | ((ContentManagementEntity)ent).SendFullDiffUpdate(client); |
114 | } | 114 | } |
115 | 115 | ||
116 | // Entities from List to ALL | 116 | // Entities from List to ALL |
117 | public void DisplayEntities(ArrayList list) | 117 | public void DisplayEntities(ArrayList list) |
118 | { | 118 | { |
119 | foreach( Object ent in list) | 119 | foreach (Object ent in list) |
120 | ((ContentManagementEntity)ent).SendFullDiffUpdateToAll(); | 120 | ((ContentManagementEntity)ent).SendFullDiffUpdateToAll(); |
121 | } | 121 | } |
122 | 122 | ||
123 | // Entity to ALL | 123 | // Entity to ALL |
@@ -138,7 +138,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
138 | { | 138 | { |
139 | ContentManagementEntity group = m_model.GetMetaGroupByPrim(uuid); | 139 | ContentManagementEntity group = m_model.GetMetaGroupByPrim(uuid); |
140 | if (group != null) | 140 | if (group != null) |
141 | group.SendFullDiffUpdateToAll(); | 141 | group.SendFullDiffUpdateToAll(); |
142 | } | 142 | } |
143 | 143 | ||
144 | /// <summary> | 144 | /// <summary> |
@@ -158,14 +158,14 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
158 | 158 | ||
159 | public void HideAllAuras() | 159 | public void HideAllAuras() |
160 | { | 160 | { |
161 | foreach(Object obj in m_model.MetaEntityCollection.Auras.Values) | 161 | foreach (Object obj in m_model.MetaEntityCollection.Auras.Values) |
162 | ((MetaEntity)obj).HideFromAll(); | 162 | ((MetaEntity)obj).HideFromAll(); |
163 | } | 163 | } |
164 | 164 | ||
165 | public void HideAllMetaEntities() | 165 | public void HideAllMetaEntities() |
166 | { | 166 | { |
167 | foreach(Object obj in m_model.MetaEntityCollection.Entities.Values) | 167 | foreach (Object obj in m_model.MetaEntityCollection.Entities.Values) |
168 | ((ContentManagementEntity)obj).HideFromAll(); | 168 | ((ContentManagementEntity)obj).HideFromAll(); |
169 | } | 169 | } |
170 | 170 | ||
171 | public void Initialise(CMModel model) | 171 | public void Initialise(CMModel model) |
@@ -183,12 +183,12 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
183 | { | 183 | { |
184 | // Deal with revisioned parts that have been deleted. | 184 | // Deal with revisioned parts that have been deleted. |
185 | if (m_model.MetaEntityCollection.Entities.ContainsKey(group.UUID)) | 185 | if (m_model.MetaEntityCollection.Entities.ContainsKey(group.UUID)) |
186 | ((ContentManagementEntity)m_model.MetaEntityCollection.Entities[group.UUID]).SendFullDiffUpdateToAll(); | 186 | ((ContentManagementEntity)m_model.MetaEntityCollection.Entities[group.UUID]).SendFullDiffUpdateToAll(); |
187 | 187 | ||
188 | // Deal with new parts not revisioned that have been deleted. | 188 | // Deal with new parts not revisioned that have been deleted. |
189 | foreach(SceneObjectPart part in group.Children.Values) | 189 | foreach (SceneObjectPart part in group.Children.Values) |
190 | if (m_model.MetaEntityCollection.Auras.ContainsKey(part.UUID)) | 190 | if (m_model.MetaEntityCollection.Auras.ContainsKey(part.UUID)) |
191 | ((AuraMetaEntity)m_model.MetaEntityCollection.Auras[part.UUID]).HideFromAll(); | 191 | ((AuraMetaEntity)m_model.MetaEntityCollection.Auras[part.UUID]).HideFromAll(); |
192 | } | 192 | } |
193 | 193 | ||
194 | public void SendMetaEntitiesToNewClient(IClientAPI client) | 194 | public void SendMetaEntitiesToNewClient(IClientAPI client) |