diff options
author | Jeff Ames | 2008-05-30 08:35:57 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-30 08:35:57 +0000 |
commit | 04625109560fb54d613b1fc9c81a8a9f387720c9 (patch) | |
tree | af00035a676beee3542a55cd13ce09e57f1ad778 /OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins | |
parent | thanks krtaylor for a (diff) | |
download | opensim-SC-04625109560fb54d613b1fc9c81a8a9f387720c9.zip opensim-SC-04625109560fb54d613b1fc9c81a8a9f387720c9.tar.gz opensim-SC-04625109560fb54d613b1fc9c81a8a9f387720c9.tar.bz2 opensim-SC-04625109560fb54d613b1fc9c81a8a9f387720c9.tar.xz |
Update svn properties. Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Dataserver.cs | 16 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs | 8 |
2 files changed, 12 insertions, 12 deletions
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 | |||
59 | public LLUUID RegisterRequest(uint localID, LLUUID itemID, | 59 | public LLUUID RegisterRequest(uint localID, LLUUID itemID, |
60 | string identifier) | 60 | string identifier) |
61 | { | 61 | { |
62 | lock(DataserverRequests) | 62 | lock (DataserverRequests) |
63 | { | 63 | { |
64 | if(DataserverRequests.ContainsKey(identifier)) | 64 | if (DataserverRequests.ContainsKey(identifier)) |
65 | return LLUUID.Zero; | 65 | return LLUUID.Zero; |
66 | 66 | ||
67 | DataserverRequest ds = new DataserverRequest(); | 67 | DataserverRequest ds = new DataserverRequest(); |
@@ -84,9 +84,9 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin | |||
84 | { | 84 | { |
85 | DataserverRequest ds; | 85 | DataserverRequest ds; |
86 | 86 | ||
87 | lock(DataserverRequests) | 87 | lock (DataserverRequests) |
88 | { | 88 | { |
89 | if(!DataserverRequests.ContainsKey(identifier)) | 89 | if (!DataserverRequests.ContainsKey(identifier)) |
90 | return; | 90 | return; |
91 | 91 | ||
92 | ds=DataserverRequests[identifier]; | 92 | ds=DataserverRequests[identifier]; |
@@ -101,11 +101,11 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin | |||
101 | 101 | ||
102 | public void RemoveEvents(uint localID, LLUUID itemID) | 102 | public void RemoveEvents(uint localID, LLUUID itemID) |
103 | { | 103 | { |
104 | lock(DataserverRequests) | 104 | lock (DataserverRequests) |
105 | { | 105 | { |
106 | foreach (DataserverRequest ds in new List<DataserverRequest>(DataserverRequests.Values)) | 106 | foreach (DataserverRequest ds in new List<DataserverRequest>(DataserverRequests.Values)) |
107 | { | 107 | { |
108 | if(ds.itemID == itemID) | 108 | if (ds.itemID == itemID) |
109 | DataserverRequests.Remove(ds.handle); | 109 | DataserverRequests.Remove(ds.handle); |
110 | } | 110 | } |
111 | } | 111 | } |
@@ -113,11 +113,11 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin | |||
113 | 113 | ||
114 | public void ExpireRequests() | 114 | public void ExpireRequests() |
115 | { | 115 | { |
116 | lock(DataserverRequests) | 116 | lock (DataserverRequests) |
117 | { | 117 | { |
118 | foreach (DataserverRequest ds in new List<DataserverRequest>(DataserverRequests.Values)) | 118 | foreach (DataserverRequest ds in new List<DataserverRequest>(DataserverRequests.Values)) |
119 | { | 119 | { |
120 | if(ds.startTime > DateTime.Now.AddSeconds(30)) | 120 | if (ds.startTime > DateTime.Now.AddSeconds(30)) |
121 | DataserverRequests.Remove(ds.handle); | 121 | DataserverRequests.Remove(ds.handle); |
122 | } | 122 | } |
123 | } | 123 | } |
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 | |||
57 | bool handled = false; | 57 | bool handled = false; |
58 | 58 | ||
59 | // Request must be taken out of the queue in case there is no handler, otherwise we loop infinitely | 59 | // Request must be taken out of the queue in case there is no handler, otherwise we loop infinitely |
60 | xmlrpc.RemoveCompletedRequest(rInfo.GetMessageID()); | 60 | xmlrpc.RemoveCompletedRequest(rInfo.GetMessageID()); |
61 | 61 | ||
62 | // And since the xmlrpc request queue is actually shared among all regions on the simulator, we need | 62 | // And since the xmlrpc request queue is actually shared among all regions on the simulator, we need |
63 | // to look in each one for the appropriate handler | 63 | // to look in each one for the appropriate handler |
@@ -96,9 +96,9 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin | |||
96 | 96 | ||
97 | // Request must be taken out of the queue in case there is no handler, otherwise we loop infinitely | 97 | // Request must be taken out of the queue in case there is no handler, otherwise we loop infinitely |
98 | xmlrpc.RemoveCompletedSRDRequest(srdInfo.GetReqID()); | 98 | xmlrpc.RemoveCompletedSRDRequest(srdInfo.GetReqID()); |
99 | 99 | ||
100 | // And this is another shared queue... so we check each of the script engines for a handler | 100 | // And this is another shared queue... so we check each of the script engines for a handler |
101 | foreach (ScriptEngine sman in ScriptEngine.ScriptEngines) | 101 | foreach (ScriptEngine sman in ScriptEngine.ScriptEngines) |
102 | { | 102 | { |
103 | if (sman.m_ScriptManager.GetScript(srdInfo.m_localID,srdInfo.m_itemID) != null) { | 103 | if (sman.m_ScriptManager.GetScript(srdInfo.m_localID,srdInfo.m_itemID) != null) { |
104 | 104 | ||
@@ -116,7 +116,7 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugin | |||
116 | handled = true; | 116 | handled = true; |
117 | } | 117 | } |
118 | } | 118 | } |
119 | 119 | ||
120 | if (! handled) | 120 | if (! handled) |
121 | { | 121 | { |
122 | Console.WriteLine("Unhandled xml_srdrequest: " + srdInfo.GetReqID()); | 122 | Console.WriteLine("Unhandled xml_srdrequest: " + srdInfo.GetReqID()); |