diff options
author | lbsa71 | 2009-02-12 09:53:12 +0000 |
---|---|---|
committer | lbsa71 | 2009-02-12 09:53:12 +0000 |
commit | 801da4346aeb3c08969c4845f5c595135a64470a (patch) | |
tree | 2f06e24c72e0d513c8e4c6aa9b75cd2c7b50f393 /OpenSim/Grid/MessagingServer | |
parent | Thanks Kitto Flora for a patch that adds automatic min fly height to ODE - Ma... (diff) | |
download | opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.zip opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.gz opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.bz2 opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.xz |
* optimized usings.
Diffstat (limited to 'OpenSim/Grid/MessagingServer')
-rw-r--r-- | OpenSim/Grid/MessagingServer/Main.cs | 3 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/MessageService.cs | 10 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/PresenceInformer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/PresenceService.cs | 4 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/UserManager.cs | 8 | ||||
-rw-r--r-- | OpenSim/Grid/MessagingServer/XMPPHTTPService.cs | 3 |
7 files changed, 8 insertions, 24 deletions
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs index 13f52ab..2f63ee9 100644 --- a/OpenSim/Grid/MessagingServer/Main.cs +++ b/OpenSim/Grid/MessagingServer/Main.cs | |||
@@ -28,12 +28,9 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using OpenMetaverse; | ||
32 | using log4net; | 31 | using log4net; |
33 | using log4net.Config; | 32 | using log4net.Config; |
34 | |||
35 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Communications.Cache; | ||
37 | using OpenSim.Framework.Console; | 34 | using OpenSim.Framework.Console; |
38 | using OpenSim.Framework.Servers; | 35 | using OpenSim.Framework.Servers; |
39 | 36 | ||
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs index 7a4a47f..36f8b91 100644 --- a/OpenSim/Grid/MessagingServer/MessageService.cs +++ b/OpenSim/Grid/MessagingServer/MessageService.cs | |||
@@ -29,13 +29,15 @@ 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.Threading; | ||
33 | using System.Reflection; | 32 | using System.Reflection; |
34 | using OpenMetaverse; | 33 | using System.Threading; |
34 | using System.Timers; | ||
35 | using log4net; | 35 | using log4net; |
36 | using Nwc.XmlRpc; | 36 | using Nwc.XmlRpc; |
37 | using OpenMetaverse; | ||
37 | using OpenSim.Data; | 38 | using OpenSim.Data; |
38 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
40 | using Timer=System.Timers.Timer; | ||
39 | 41 | ||
40 | namespace OpenSim.Grid.MessagingServer | 42 | namespace OpenSim.Grid.MessagingServer |
41 | { | 43 | { |
@@ -52,7 +54,7 @@ namespace OpenSim.Grid.MessagingServer | |||
52 | // a dictionary of all current regions this server knows about | 54 | // a dictionary of all current regions this server knows about |
53 | private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong,RegionProfileData>(); | 55 | private Dictionary<ulong, RegionProfileData> m_regionInfoCache = new Dictionary<ulong,RegionProfileData>(); |
54 | 56 | ||
55 | private System.Timers.Timer reconnectTimer = new System.Timers.Timer(300000); // 5 mins | 57 | private Timer reconnectTimer = new Timer(300000); // 5 mins |
56 | 58 | ||
57 | public MessageService(MessageServerConfig cfg) | 59 | public MessageService(MessageServerConfig cfg) |
58 | { | 60 | { |
@@ -502,7 +504,7 @@ namespace OpenSim.Grid.MessagingServer | |||
502 | return regionProfile; | 504 | return regionProfile; |
503 | } | 505 | } |
504 | 506 | ||
505 | public void registerWithUserServer(object sender, System.Timers.ElapsedEventArgs e) | 507 | public void registerWithUserServer(object sender, ElapsedEventArgs e) |
506 | { | 508 | { |
507 | registerWithUserServer(); | 509 | registerWithUserServer(); |
508 | } | 510 | } |
diff --git a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs b/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs index 7ea1ac7..08566bb 100644 --- a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs +++ b/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs | |||
@@ -25,9 +25,7 @@ | |||
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; | ||
29 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
30 | using System.Text; | ||
31 | using OpenMetaverse; | 29 | using OpenMetaverse; |
32 | 30 | ||
33 | namespace OpenSim.Grid.MessagingServer | 31 | namespace OpenSim.Grid.MessagingServer |
diff --git a/OpenSim/Grid/MessagingServer/PresenceInformer.cs b/OpenSim/Grid/MessagingServer/PresenceInformer.cs index 39fcadb..20342ab 100644 --- a/OpenSim/Grid/MessagingServer/PresenceInformer.cs +++ b/OpenSim/Grid/MessagingServer/PresenceInformer.cs | |||
@@ -26,8 +26,8 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System.Collections; | 28 | using System.Collections; |
29 | using System.Reflection; | ||
30 | using System.Net; | 29 | using System.Net; |
30 | using System.Reflection; | ||
31 | using log4net; | 31 | using log4net; |
32 | using Nwc.XmlRpc; | 32 | using Nwc.XmlRpc; |
33 | using OpenSim.Data; | 33 | using OpenSim.Data; |
diff --git a/OpenSim/Grid/MessagingServer/PresenceService.cs b/OpenSim/Grid/MessagingServer/PresenceService.cs index df5f687..d8cb755 100644 --- a/OpenSim/Grid/MessagingServer/PresenceService.cs +++ b/OpenSim/Grid/MessagingServer/PresenceService.cs | |||
@@ -25,10 +25,6 @@ | |||
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; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | |||
32 | namespace OpenSim.Grid.MessagingServer | 28 | namespace OpenSim.Grid.MessagingServer |
33 | { | 29 | { |
34 | class PresenceService | 30 | class PresenceService |
diff --git a/OpenSim/Grid/MessagingServer/UserManager.cs b/OpenSim/Grid/MessagingServer/UserManager.cs index fc8f703..4b07df7 100644 --- a/OpenSim/Grid/MessagingServer/UserManager.cs +++ b/OpenSim/Grid/MessagingServer/UserManager.cs | |||
@@ -25,17 +25,9 @@ | |||
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; | ||
29 | using System.Collections; | ||
30 | using System.Collections.Generic; | ||
31 | using System.Reflection; | ||
32 | using System.Text.RegularExpressions; | ||
33 | using OpenMetaverse; | 28 | using OpenMetaverse; |
34 | using log4net; | ||
35 | using Nwc.XmlRpc; | ||
36 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Communications; | 30 | using OpenSim.Framework.Communications; |
38 | using OpenSim.Framework.Servers; | ||
39 | 31 | ||
40 | namespace OpenSim.Grid.MessagingServer | 32 | namespace OpenSim.Grid.MessagingServer |
41 | { | 33 | { |
diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs index 9d3f2bf..87647cd 100644 --- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs +++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs | |||
@@ -27,10 +27,9 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Net; | ||
31 | using System.Reflection; | 30 | using System.Reflection; |
32 | using OpenMetaverse; | ||
33 | using log4net; | 31 | using log4net; |
32 | using OpenMetaverse; | ||
34 | using OpenSim.Framework.Servers; | 33 | using OpenSim.Framework.Servers; |
35 | 34 | ||
36 | namespace OpenSim.Grid.MessagingServer | 35 | namespace OpenSim.Grid.MessagingServer |