diff options
author | Jeff Ames | 2009-10-01 01:00:09 +0900 |
---|---|---|
committer | Jeff Ames | 2009-10-01 01:17:47 +0900 |
commit | ee205e7e812e170f670e690a4e0fa9caa652f226 (patch) | |
tree | df407e66d9aa47a884e39d5d86b877d6ef468a1a /OpenSim/Region/ScriptEngine/XEngine | |
parent | adding LandDataSerializer (not connected anywhere, work-in-progress) (diff) | |
download | opensim-SC-ee205e7e812e170f670e690a4e0fa9caa652f226.zip opensim-SC-ee205e7e812e170f670e690a4e0fa9caa652f226.tar.gz opensim-SC-ee205e7e812e170f670e690a4e0fa9caa652f226.tar.bz2 opensim-SC-ee205e7e812e170f670e690a4e0fa9caa652f226.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 9a972c2..e695133 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -554,7 +554,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
554 | 554 | ||
555 | // We must look for the part outside the m_Scripts lock because GetSceneObjectPart later triggers the | 555 | // We must look for the part outside the m_Scripts lock because GetSceneObjectPart later triggers the |
556 | // m_parts lock on SOG. At the same time, a scene object that is being deleted will take the m_parts lock | 556 | // m_parts lock on SOG. At the same time, a scene object that is being deleted will take the m_parts lock |
557 | // and then later on try to take the m_scripts lock in this class when it calls OnRemoveScript() | 557 | // and then later on try to take the m_scripts lock in this class when it calls OnRemoveScript() |
558 | SceneObjectPart part = m_Scene.GetSceneObjectPart(localID); | 558 | SceneObjectPart part = m_Scene.GetSceneObjectPart(localID); |
559 | if (part == null) | 559 | if (part == null) |
560 | { | 560 | { |
@@ -562,7 +562,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
562 | m_ScriptErrorMessage += "SceneObjectPart unavailable. Script NOT started.\n"; | 562 | m_ScriptErrorMessage += "SceneObjectPart unavailable. Script NOT started.\n"; |
563 | m_ScriptFailCount++; | 563 | m_ScriptFailCount++; |
564 | return false; | 564 | return false; |
565 | } | 565 | } |
566 | 566 | ||
567 | TaskInventoryItem item = part.Inventory.GetInventoryItem(itemID); | 567 | TaskInventoryItem item = part.Inventory.GetInventoryItem(itemID); |
568 | if (item == null) | 568 | if (item == null) |
@@ -692,7 +692,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
692 | AppDomain.CreateDomain( | 692 | AppDomain.CreateDomain( |
693 | m_Scene.RegionInfo.RegionID.ToString(), | 693 | m_Scene.RegionInfo.RegionID.ToString(), |
694 | evidence, appSetup); | 694 | evidence, appSetup); |
695 | /* | 695 | /* |
696 | PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel(); | 696 | PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel(); |
697 | AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition(); | 697 | AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition(); |
698 | PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet"); | 698 | PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet"); |
@@ -925,7 +925,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
925 | return new XWorkItem(m_ThreadPool.QueueWorkItem( | 925 | return new XWorkItem(m_ThreadPool.QueueWorkItem( |
926 | new WorkItemCallback(this.ProcessEventHandler), | 926 | new WorkItemCallback(this.ProcessEventHandler), |
927 | parms)); | 927 | parms)); |
928 | } | 928 | } |
929 | 929 | ||
930 | /// <summary> | 930 | /// <summary> |
931 | /// Process a previously posted script event. | 931 | /// Process a previously posted script event. |