From 04625109560fb54d613b1fc9c81a8a9f387720c9 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Fri, 30 May 2008 08:35:57 +0000 Subject: Update svn properties. Formatting cleanup. --- .../ScriptEngineBase/AsyncCommandPlugins/Dataserver.cs | 16 ++++++++-------- .../ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase') diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Dataserver.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Dataserver.cs index eb87a9c..5f86c9c 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Dataserver.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Dataserver.cs @@ -59,9 +59,9 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin public LLUUID RegisterRequest(uint localID, LLUUID itemID, string identifier) { - lock(DataserverRequests) + lock (DataserverRequests) { - if(DataserverRequests.ContainsKey(identifier)) + if (DataserverRequests.ContainsKey(identifier)) return LLUUID.Zero; DataserverRequest ds = new DataserverRequest(); @@ -84,9 +84,9 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin { DataserverRequest ds; - lock(DataserverRequests) + lock (DataserverRequests) { - if(!DataserverRequests.ContainsKey(identifier)) + if (!DataserverRequests.ContainsKey(identifier)) return; ds=DataserverRequests[identifier]; @@ -101,11 +101,11 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin public void RemoveEvents(uint localID, LLUUID itemID) { - lock(DataserverRequests) + lock (DataserverRequests) { foreach (DataserverRequest ds in new List(DataserverRequests.Values)) { - if(ds.itemID == itemID) + if (ds.itemID == itemID) DataserverRequests.Remove(ds.handle); } } @@ -113,11 +113,11 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin public void ExpireRequests() { - lock(DataserverRequests) + lock (DataserverRequests) { foreach (DataserverRequest ds in new List(DataserverRequests.Values)) { - if(ds.startTime > DateTime.Now.AddSeconds(30)) + if (ds.startTime > DateTime.Now.AddSeconds(30)) DataserverRequests.Remove(ds.handle); } } diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs index c793add..ba6a98c 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs @@ -57,7 +57,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin bool handled = false; // Request must be taken out of the queue in case there is no handler, otherwise we loop infinitely - xmlrpc.RemoveCompletedRequest(rInfo.GetMessageID()); + xmlrpc.RemoveCompletedRequest(rInfo.GetMessageID()); // And since the xmlrpc request queue is actually shared among all regions on the simulator, we need // to look in each one for the appropriate handler @@ -96,9 +96,9 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin // Request must be taken out of the queue in case there is no handler, otherwise we loop infinitely xmlrpc.RemoveCompletedSRDRequest(srdInfo.GetReqID()); - + // And this is another shared queue... so we check each of the script engines for a handler - foreach (ScriptEngine sman in ScriptEngine.ScriptEngines) + foreach (ScriptEngine sman in ScriptEngine.ScriptEngines) { if (sman.m_ScriptManager.GetScript(srdInfo.m_localID,srdInfo.m_itemID) != null) { @@ -116,7 +116,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin handled = true; } } - + if (! handled) { Console.WriteLine("Unhandled xml_srdrequest: " + srdInfo.GetReqID()); -- cgit v1.1