diff options
author | Jeff Ames | 2008-06-04 09:59:27 +0000 |
---|---|---|
committer | Jeff Ames | 2008-06-04 09:59:27 +0000 |
commit | 4ec4e16c809cf86a63b736d2b7b6ad7291595a5f (patch) | |
tree | cfa896ef9057228171e2ee39c4807060101ba90b /OpenSim/Region/ScriptEngine/XEngine/AsyncCommandManager.cs | |
parent | * If a ThreadAbortException reaches AuthUser() then let it pass through unmol... (diff) | |
download | opensim-SC-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.zip opensim-SC-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.gz opensim-SC-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.bz2 opensim-SC-4ec4e16c809cf86a63b736d2b7b6ad7291595a5f.tar.xz |
Formatting cleanup, minor refactoring, svn properties.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/AsyncCommandManager.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/AsyncCommandManager.cs | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandManager.cs index 4ec7916..fdad5b0 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandManager.cs | |||
@@ -184,7 +184,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
184 | List<Object> data = new List<Object>(); | 184 | List<Object> data = new List<Object>(); |
185 | 185 | ||
186 | Object[] listeners=m_Listener.GetSerializationData(itemID); | 186 | Object[] listeners=m_Listener.GetSerializationData(itemID); |
187 | if(listeners.Length > 0) | 187 | if (listeners.Length > 0) |
188 | { | 188 | { |
189 | data.Add("listener"); | 189 | data.Add("listener"); |
190 | data.Add(listeners.Length); | 190 | data.Add(listeners.Length); |
@@ -192,7 +192,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
192 | } | 192 | } |
193 | 193 | ||
194 | Object[] timers=m_Timer.GetSerializationData(itemID); | 194 | Object[] timers=m_Timer.GetSerializationData(itemID); |
195 | if(timers.Length > 0) | 195 | if (timers.Length > 0) |
196 | { | 196 | { |
197 | data.Add("timer"); | 197 | data.Add("timer"); |
198 | data.Add(timers.Length); | 198 | data.Add(timers.Length); |
@@ -200,7 +200,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
200 | } | 200 | } |
201 | 201 | ||
202 | Object[] sensors=m_SensorRepeat.GetSerializationData(itemID); | 202 | Object[] sensors=m_SensorRepeat.GetSerializationData(itemID); |
203 | if(sensors.Length > 0) | 203 | if (sensors.Length > 0) |
204 | { | 204 | { |
205 | data.Add("sensor"); | 205 | data.Add("sensor"); |
206 | data.Add(sensors.Length); | 206 | data.Add(sensors.Length); |
@@ -211,36 +211,36 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
211 | } | 211 | } |
212 | 212 | ||
213 | public void CreateFromData(uint localID, LLUUID itemID, LLUUID hostID, | 213 | public void CreateFromData(uint localID, LLUUID itemID, LLUUID hostID, |
214 | Object[] data) | 214 | Object[] data) |
215 | { | 215 | { |
216 | int idx=0; | 216 | int idx = 0; |
217 | int len; | 217 | int len; |
218 | 218 | ||
219 | while(idx < data.Length) | 219 | while (idx < data.Length) |
220 | { | 220 | { |
221 | string type = data[idx].ToString(); | 221 | string type = data[idx].ToString(); |
222 | len = (int)data[idx+1]; | 222 | len = (int)data[idx+1]; |
223 | idx+=2; | 223 | idx+=2; |
224 | 224 | ||
225 | if(len > 0) | 225 | if (len > 0) |
226 | { | 226 | { |
227 | Object[] item = new Object[len]; | 227 | Object[] item = new Object[len]; |
228 | Array.Copy(data, idx, item, 0, len); | 228 | Array.Copy(data, idx, item, 0, len); |
229 | 229 | ||
230 | idx+=len; | 230 | idx+=len; |
231 | 231 | ||
232 | switch(type) | 232 | switch (type) |
233 | { | 233 | { |
234 | case "listener": | 234 | case "listener": |
235 | m_Listener.CreateFromData(localID, itemID, hostID, | 235 | m_Listener.CreateFromData(localID, itemID, hostID, |
236 | item); | 236 | item); |
237 | break; | 237 | break; |
238 | case "timer": | 238 | case "timer": |
239 | m_Timer.CreateFromData(localID, itemID, hostID, item); | 239 | m_Timer.CreateFromData(localID, itemID, hostID, item); |
240 | break; | 240 | break; |
241 | case "sensor": | 241 | case "sensor": |
242 | m_SensorRepeat.CreateFromData(localID, itemID, hostID, | 242 | m_SensorRepeat.CreateFromData(localID, itemID, hostID, |
243 | item); | 243 | item); |
244 | break; | 244 | break; |
245 | } | 245 | } |
246 | } | 246 | } |
@@ -249,12 +249,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
249 | 249 | ||
250 | #region Check llRemoteData channels | 250 | #region Check llRemoteData channels |
251 | 251 | ||
252 | |||
253 | #endregion | 252 | #endregion |
254 | 253 | ||
255 | #region Check llListeners | 254 | #region Check llListeners |
256 | 255 | ||
257 | |||
258 | #endregion | 256 | #endregion |
259 | 257 | ||
260 | /// <summary> | 258 | /// <summary> |