diff options
author | Jeff Ames | 2008-09-09 01:26:48 +0000 |
---|---|---|
committer | Jeff Ames | 2008-09-09 01:26:48 +0000 |
commit | fae34bb10cfa10702faf5c19d8c8517faa018cb5 (patch) | |
tree | 2001f24703b010957254dbb49ef5e222ff30b84d /OpenSim/Region/ScriptEngine | |
parent | Fix state xxx within state xxx itself triggering a state "change" to (diff) | |
download | opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.zip opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.gz opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.bz2 opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.xz |
Update svn properties, formatting cleanup.
Diffstat (limited to '')
4 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index ebf2a15..9405198 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -7546,7 +7546,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
7546 | 7546 | ||
7547 | // the object we are in | 7547 | // the object we are in |
7548 | UUID objectID = m_host.ParentUUID; | 7548 | UUID objectID = m_host.ParentUUID; |
7549 | if(objectID == UUID.Zero) return; | 7549 | if (objectID == UUID.Zero) return; |
7550 | 7550 | ||
7551 | // we need the permission first, to know which avatar we want to set the camera for | 7551 | // we need the permission first, to know which avatar we want to set the camera for |
7552 | UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; | 7552 | UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; |
@@ -7597,7 +7597,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
7597 | 7597 | ||
7598 | // the object we are in | 7598 | // the object we are in |
7599 | UUID objectID = m_host.ParentUUID; | 7599 | UUID objectID = m_host.ParentUUID; |
7600 | if(objectID == UUID.Zero) return; | 7600 | if (objectID == UUID.Zero) return; |
7601 | 7601 | ||
7602 | // we need the permission first, to know which avatar we want to clear the camera for | 7602 | // we need the permission first, to know which avatar we want to clear the camera for |
7603 | UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; | 7603 | UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index ae775f7..4b70ec8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7418,7 +7418,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7418 | 7418 | ||
7419 | // the object we are in | 7419 | // the object we are in |
7420 | UUID objectID = m_host.ParentUUID; | 7420 | UUID objectID = m_host.ParentUUID; |
7421 | if(objectID == UUID.Zero) return; | 7421 | if (objectID == UUID.Zero) return; |
7422 | 7422 | ||
7423 | // we need the permission first, to know which avatar we want to set the camera for | 7423 | // we need the permission first, to know which avatar we want to set the camera for |
7424 | UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; | 7424 | UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; |
@@ -7469,7 +7469,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7469 | 7469 | ||
7470 | // the object we are in | 7470 | // the object we are in |
7471 | UUID objectID = m_host.ParentUUID; | 7471 | UUID objectID = m_host.ParentUUID; |
7472 | if(objectID == UUID.Zero) return; | 7472 | if (objectID == UUID.Zero) return; |
7473 | 7473 | ||
7474 | // we need the permission first, to know which avatar we want to clear the camera for | 7474 | // we need the permission first, to know which avatar we want to clear the camera for |
7475 | UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; | 7475 | UUID agentID = m_host.TaskInventory[invItemID].PermsGranter; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 97c79b5..1ee6f77 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -686,7 +686,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
686 | { | 686 | { |
687 | // If we're currently in an event, just tell it to save upon return | 687 | // If we're currently in an event, just tell it to save upon return |
688 | // | 688 | // |
689 | if(m_InEvent) | 689 | if (m_InEvent) |
690 | { | 690 | { |
691 | m_SaveState = true; | 691 | m_SaveState = true; |
692 | return; | 692 | return; |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index bb08a60..6582686 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -216,13 +216,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
216 | 216 | ||
217 | if (sleepTime > 0) | 217 | if (sleepTime > 0) |
218 | { | 218 | { |
219 | m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance), | 219 | m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance), |
220 | new Object[]{ sleepTime }); | 220 | new Object[]{ sleepTime }); |
221 | } | 221 | } |
222 | 222 | ||
223 | if (saveTime > 0) | 223 | if (saveTime > 0) |
224 | { | 224 | { |
225 | m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoBackup), | 225 | m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoBackup), |
226 | new Object[] { saveTime }); | 226 | new Object[] { saveTime }); |
227 | } | 227 | } |
228 | 228 | ||
@@ -278,7 +278,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
278 | instances.Clear(); | 278 | instances.Clear(); |
279 | 279 | ||
280 | if (saveTime > 0) | 280 | if (saveTime > 0) |
281 | m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoBackup), | 281 | m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoBackup), |
282 | new Object[] { saveTime }); | 282 | new Object[] { saveTime }); |
283 | 283 | ||
284 | return 0; | 284 | return 0; |
@@ -301,7 +301,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
301 | 301 | ||
302 | System.Threading.Thread.Sleep(sleepTime); | 302 | System.Threading.Thread.Sleep(sleepTime); |
303 | 303 | ||
304 | m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance), | 304 | m_ThreadPool.QueueWorkItem(new WorkItemCallback(this.DoMaintenance), |
305 | new Object[]{ sleepTime }); | 305 | new Object[]{ sleepTime }); |
306 | 306 | ||
307 | return 0; | 307 | return 0; |
@@ -331,13 +331,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
331 | { | 331 | { |
332 | m_firstStart = false; | 332 | m_firstStart = false; |
333 | m_CurrentCompile = m_ThreadPool.QueueWorkItem( | 333 | m_CurrentCompile = m_ThreadPool.QueueWorkItem( |
334 | new WorkItemCallback(this.DoScriptWait), | 334 | new WorkItemCallback(this.DoScriptWait), |
335 | new Object[0]); | 335 | new Object[0]); |
336 | return; | 336 | return; |
337 | } | 337 | } |
338 | 338 | ||
339 | m_CurrentCompile = m_ThreadPool.QueueWorkItem( | 339 | m_CurrentCompile = m_ThreadPool.QueueWorkItem( |
340 | new WorkItemCallback(this.DoOnRezScriptQueue), | 340 | new WorkItemCallback(this.DoOnRezScriptQueue), |
341 | new Object[0]); | 341 | new Object[0]); |
342 | } | 342 | } |
343 | } | 343 | } |
@@ -352,7 +352,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
352 | if (m_CompileQueue.Count > 0) | 352 | if (m_CompileQueue.Count > 0) |
353 | { | 353 | { |
354 | m_CurrentCompile = m_ThreadPool.QueueWorkItem( | 354 | m_CurrentCompile = m_ThreadPool.QueueWorkItem( |
355 | new WorkItemCallback(this.DoOnRezScriptQueue), | 355 | new WorkItemCallback(this.DoOnRezScriptQueue), |
356 | new Object[0]); | 356 | new Object[0]); |
357 | } | 357 | } |
358 | else | 358 | else |
@@ -383,7 +383,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
383 | if (m_CompileQueue.Count > 0) | 383 | if (m_CompileQueue.Count > 0) |
384 | { | 384 | { |
385 | m_CurrentCompile = m_ThreadPool.QueueWorkItem( | 385 | m_CurrentCompile = m_ThreadPool.QueueWorkItem( |
386 | new WorkItemCallback(this.DoOnRezScriptQueue), | 386 | new WorkItemCallback(this.DoOnRezScriptQueue), |
387 | new Object[0]); | 387 | new Object[0]); |
388 | } | 388 | } |
389 | else | 389 | else |
@@ -493,7 +493,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
493 | } | 493 | } |
494 | m_DomainScripts[appDomain].Add(itemID); | 494 | m_DomainScripts[appDomain].Add(itemID); |
495 | 495 | ||
496 | ScriptInstance instance = | 496 | ScriptInstance instance = |
497 | new ScriptInstance(this,localID, | 497 | new ScriptInstance(this,localID, |
498 | part.UUID, itemID, assetID, assembly, | 498 | part.UUID, itemID, assetID, assembly, |
499 | m_AppDomains[appDomain], | 499 | m_AppDomains[appDomain], |
@@ -657,7 +657,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
657 | public IScriptWorkItem QueueEventHandler(object parms) | 657 | public IScriptWorkItem QueueEventHandler(object parms) |
658 | { | 658 | { |
659 | return new XWorkItem(m_ThreadPool.QueueWorkItem( | 659 | return new XWorkItem(m_ThreadPool.QueueWorkItem( |
660 | new WorkItemCallback(this.ProcessEventHandler), | 660 | new WorkItemCallback(this.ProcessEventHandler), |
661 | parms)); | 661 | parms)); |
662 | } | 662 | } |
663 | 663 | ||
@@ -723,7 +723,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
723 | string[] pathList = new string[] {"bin", "ScriptEngines", | 723 | string[] pathList = new string[] {"bin", "ScriptEngines", |
724 | Path.Combine("ScriptEngines", | 724 | Path.Combine("ScriptEngines", |
725 | m_Scene.RegionInfo.RegionID.ToString())}; | 725 | m_Scene.RegionInfo.RegionID.ToString())}; |
726 | 726 | ||
727 | string assemblyName = args.Name; | 727 | string assemblyName = args.Name; |
728 | if (assemblyName.IndexOf(",") != -1) | 728 | if (assemblyName.IndexOf(",") != -1) |
729 | assemblyName = args.Name.Substring(0, args.Name.IndexOf(",")); | 729 | assemblyName = args.Name.Substring(0, args.Name.IndexOf(",")); |