diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs | 45 |
1 files changed, 18 insertions, 27 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs index e81466a..3999213 100644 --- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs | |||
@@ -25,32 +25,23 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Net; | 31 | using System.Net; |
32 | using System.Net.Sockets; | 32 | using System.Reflection; |
33 | using System.Reflection; | 33 | using System.Threading; |
34 | using System.Threading; | 34 | using log4net; |
35 | using System.Xml; | 35 | using Nini.Config; |
36 | using OpenMetaverse; | 36 | using OpenMetaverse; |
37 | using OpenMetaverse.Packets; | 37 | using OpenMetaverse.Packets; |
38 | using OpenMetaverse.StructuredData; | 38 | using OpenMetaverse.StructuredData; |
39 | using log4net; | 39 | using OpenSim.Framework; |
40 | using Nini.Config; | 40 | using OpenSim.Framework.Servers; |
41 | using Nwc.XmlRpc; | 41 | using OpenSim.Region.Framework.Interfaces; |
42 | using OpenSim.Framework; | 42 | using OpenSim.Region.Framework.Scenes; |
43 | using OpenSim.Framework.Communications.Cache; | 43 | using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>; |
44 | using OpenSim.Framework.Communications.Capabilities; | 44 | using Caps=OpenSim.Framework.Communications.Capabilities.Caps; |
45 | using OpenSim.Framework.Servers; | ||
46 | using OpenSim.Region.Framework.Interfaces; | ||
47 | using OpenSim.Region.Framework.Scenes; | ||
48 | |||
49 | using OSD = OpenMetaverse.StructuredData.OSD; | ||
50 | using OSDMap = OpenMetaverse.StructuredData.OSDMap; | ||
51 | using OSDArray = OpenMetaverse.StructuredData.OSDArray; | ||
52 | using Caps = OpenSim.Framework.Communications.Capabilities.Caps; | ||
53 | using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>; | ||
54 | 45 | ||
55 | namespace OpenSim.Region.CoreModules.Framework.EventQueue | 46 | namespace OpenSim.Region.CoreModules.Framework.EventQueue |
56 | { | 47 | { |
@@ -326,7 +317,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
326 | m_scene.CommsManager.HttpServer.AddHTTPHandler( | 317 | m_scene.CommsManager.HttpServer.AddHTTPHandler( |
327 | capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2); | 318 | capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePath2); |
328 | 319 | ||
329 | Random rnd = new Random(System.Environment.TickCount); | 320 | Random rnd = new Random(Environment.TickCount); |
330 | lock (m_ids) | 321 | lock (m_ids) |
331 | { | 322 | { |
332 | if (!m_ids.ContainsKey(agentID)) | 323 | if (!m_ids.ContainsKey(agentID)) |