diff options
Formatting cleanup, minor refactoring, svn properties.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine/AsyncCommandPlugins/Dataserver.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/AsyncCommandPlugins/Dataserver.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandPlugins/Dataserver.cs b/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandPlugins/Dataserver.cs index 794a015..47ab420 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandPlugins/Dataserver.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/AsyncCommandPlugins/Dataserver.cs | |||
@@ -57,11 +57,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins | |||
57 | } | 57 | } |
58 | 58 | ||
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.XEngine.AsyncCommandPlugins | |||
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]; |
@@ -94,7 +94,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins | |||
94 | } | 94 | } |
95 | 95 | ||
96 | m_CmdManager.m_ScriptEngine.PostObjectEvent(ds.localID, | 96 | m_CmdManager.m_ScriptEngine.PostObjectEvent(ds.localID, |
97 | new XEventParams( "dataserver", new Object[] | 97 | new XEventParams("dataserver", new Object[] |
98 | { new LSL_Types.LSLString(ds.ID.ToString()), | 98 | { new LSL_Types.LSLString(ds.ID.ToString()), |
99 | new LSL_Types.LSLString(reply)}, | 99 | new LSL_Types.LSLString(reply)}, |
100 | new XDetectParams[0])); | 100 | new XDetectParams[0])); |
@@ -102,11 +102,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins | |||
102 | 102 | ||
103 | public void RemoveEvents(uint localID, LLUUID itemID) | 103 | public void RemoveEvents(uint localID, LLUUID itemID) |
104 | { | 104 | { |
105 | lock(DataserverRequests) | 105 | lock (DataserverRequests) |
106 | { | 106 | { |
107 | foreach (DataserverRequest ds in new List<DataserverRequest>(DataserverRequests.Values)) | 107 | foreach (DataserverRequest ds in new List<DataserverRequest>(DataserverRequests.Values)) |
108 | { | 108 | { |
109 | if(ds.itemID == itemID) | 109 | if (ds.itemID == itemID) |
110 | DataserverRequests.Remove(ds.handle); | 110 | DataserverRequests.Remove(ds.handle); |
111 | } | 111 | } |
112 | } | 112 | } |
@@ -114,11 +114,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine.AsyncCommandPlugins | |||
114 | 114 | ||
115 | public void ExpireRequests() | 115 | public void ExpireRequests() |
116 | { | 116 | { |
117 | lock(DataserverRequests) | 117 | lock (DataserverRequests) |
118 | { | 118 | { |
119 | foreach (DataserverRequest ds in new List<DataserverRequest>(DataserverRequests.Values)) | 119 | foreach (DataserverRequest ds in new List<DataserverRequest>(DataserverRequests.Values)) |
120 | { | 120 | { |
121 | if(ds.startTime > DateTime.Now.AddSeconds(30)) | 121 | if (ds.startTime > DateTime.Now.AddSeconds(30)) |
122 | DataserverRequests.Remove(ds.handle); | 122 | DataserverRequests.Remove(ds.handle); |
123 | } | 123 | } |
124 | } | 124 | } |