From 801da4346aeb3c08969c4845f5c595135a64470a Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Thu, 12 Feb 2009 09:53:12 +0000 Subject: * optimized usings. --- OpenSim/Grid/AssetServer/Main.cs | 4 ++-- OpenSim/Grid/AssetServer/RestService.cs | 5 ++--- OpenSim/Grid/GridServer/GridManager.cs | 3 +-- OpenSim/Grid/GridServer/GridServerBase.cs | 1 - OpenSim/Grid/GridServer/Program.cs | 1 - OpenSim/Grid/InventoryServer/GridInventoryService.cs | 7 ++----- OpenSim/Grid/InventoryServer/Main.cs | 2 +- OpenSim/Grid/MessagingServer/Main.cs | 3 --- OpenSim/Grid/MessagingServer/MessageService.cs | 10 ++++++---- OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs | 2 -- OpenSim/Grid/MessagingServer/PresenceInformer.cs | 2 +- OpenSim/Grid/MessagingServer/PresenceService.cs | 4 ---- OpenSim/Grid/MessagingServer/UserManager.cs | 8 -------- OpenSim/Grid/MessagingServer/XMPPHTTPService.cs | 3 +-- OpenSim/Grid/UserServer/Main.cs | 3 +-- OpenSim/Grid/UserServer/MessageServersConnector.cs | 4 ++-- OpenSim/Grid/UserServer/OpenIdService.cs | 2 -- OpenSim/Grid/UserServer/UserLoginService.cs | 2 +- OpenSim/Grid/UserServer/UserManager.cs | 2 +- 19 files changed, 21 insertions(+), 47 deletions(-) (limited to 'OpenSim/Grid') diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs index 4609ee8..5b23d5a 100644 --- a/OpenSim/Grid/AssetServer/Main.cs +++ b/OpenSim/Grid/AssetServer/Main.cs @@ -28,15 +28,15 @@ using System; using System.IO; using System.Reflection; -using OpenMetaverse; using log4net; using log4net.Config; +using OpenMetaverse; +using OpenSim.Data; using OpenSim.Framework; using OpenSim.Framework.AssetLoader.Filesystem; using OpenSim.Framework.Console; using OpenSim.Framework.Servers; using OpenSim.Framework.Statistics; -using OpenSim.Data; namespace OpenSim.Grid.AssetServer { diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs index a44af6c..ba62c55 100644 --- a/OpenSim/Grid/AssetServer/RestService.cs +++ b/OpenSim/Grid/AssetServer/RestService.cs @@ -27,17 +27,16 @@ using System; using System.IO; -using System.Net; using System.Reflection; using System.Text; using System.Xml; using System.Xml.Serialization; -using OpenMetaverse; using log4net; +using OpenMetaverse; +using OpenSim.Data; using OpenSim.Framework; using OpenSim.Framework.Servers; using OpenSim.Framework.Statistics; -using OpenSim.Data; namespace OpenSim.Grid.AssetServer { diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index f98809d..5dc186c 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs @@ -26,15 +26,14 @@ */ using System; -using System.Text; using System.Collections; using System.Collections.Generic; using System.IO; using System.Reflection; using System.Xml; -using OpenMetaverse; using log4net; using Nwc.XmlRpc; +using OpenMetaverse; using OpenSim.Data; using OpenSim.Framework; using OpenSim.Framework.Communications; diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs index 9cc25e8..bcd1403 100644 --- a/OpenSim/Grid/GridServer/GridServerBase.cs +++ b/OpenSim/Grid/GridServer/GridServerBase.cs @@ -25,7 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; using System.Collections.Generic; using System.IO; using System.Reflection; diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Grid/GridServer/Program.cs index 0032922..3b3bb42 100644 --- a/OpenSim/Grid/GridServer/Program.cs +++ b/OpenSim/Grid/GridServer/Program.cs @@ -25,7 +25,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; using log4net.Config; namespace OpenSim.Grid.GridServer diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs index 78d9f65..16d8154 100644 --- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs +++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs @@ -28,14 +28,11 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Reflection; -using System.Threading; using System.Net; - -using OpenMetaverse; +using System.Reflection; using log4net; using Nwc.XmlRpc; - +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs index 862ae58..8ca7c3d 100644 --- a/OpenSim/Grid/InventoryServer/Main.cs +++ b/OpenSim/Grid/InventoryServer/Main.cs @@ -29,9 +29,9 @@ using System; using System.Collections.Generic; using System.IO; using System.Reflection; -using OpenMetaverse; using log4net; using log4net.Config; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Console; using OpenSim.Framework.Servers; 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 @@ using System; using System.IO; using System.Reflection; -using OpenMetaverse; using log4net; using log4net.Config; - using OpenSim.Framework; -using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Console; using OpenSim.Framework.Servers; 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; using System.Collections; using System.Collections.Generic; using System.Net; -using System.Threading; using System.Reflection; -using OpenMetaverse; +using System.Threading; +using System.Timers; using log4net; using Nwc.XmlRpc; +using OpenMetaverse; using OpenSim.Data; using OpenSim.Framework; +using Timer=System.Timers.Timer; namespace OpenSim.Grid.MessagingServer { @@ -52,7 +54,7 @@ namespace OpenSim.Grid.MessagingServer // a dictionary of all current regions this server knows about private Dictionary m_regionInfoCache = new Dictionary(); - private System.Timers.Timer reconnectTimer = new System.Timers.Timer(300000); // 5 mins + private Timer reconnectTimer = new Timer(300000); // 5 mins public MessageService(MessageServerConfig cfg) { @@ -502,7 +504,7 @@ namespace OpenSim.Grid.MessagingServer return regionProfile; } - public void registerWithUserServer(object sender, System.Timers.ElapsedEventArgs e) + public void registerWithUserServer(object sender, ElapsedEventArgs e) { registerWithUserServer(); } 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 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; using System.Collections.Generic; -using System.Text; using OpenMetaverse; 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 @@ */ using System.Collections; -using System.Reflection; using System.Net; +using System.Reflection; using log4net; using Nwc.XmlRpc; 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 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; -using System.Collections.Generic; -using System.Text; - namespace OpenSim.Grid.MessagingServer { 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 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Reflection; -using System.Text.RegularExpressions; using OpenMetaverse; -using log4net; -using Nwc.XmlRpc; using OpenSim.Framework; using OpenSim.Framework.Communications; -using OpenSim.Framework.Servers; namespace OpenSim.Grid.MessagingServer { 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 @@ using System; using System.IO; -using System.Net; using System.Reflection; -using OpenMetaverse; using log4net; +using OpenMetaverse; using OpenSim.Framework.Servers; namespace OpenSim.Grid.MessagingServer diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index dd3f0b7..3f75838 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs @@ -28,11 +28,10 @@ using System; using System.Collections.Generic; using System.IO; -using System.Net; using System.Reflection; -using OpenMetaverse; using log4net; using log4net.Config; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs index 6da67d7..8d16109 100644 --- a/OpenSim/Grid/UserServer/MessageServersConnector.cs +++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs @@ -29,12 +29,12 @@ using System.Collections; using System.Collections.Generic; using System.Net; using System.Reflection; -using OpenMetaverse; +using System.Threading; using log4net; using Nwc.XmlRpc; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Servers; -using System.Threading; namespace OpenSim.Grid.UserServer { diff --git a/OpenSim/Grid/UserServer/OpenIdService.cs b/OpenSim/Grid/UserServer/OpenIdService.cs index 78e820e..187758f 100644 --- a/OpenSim/Grid/UserServer/OpenIdService.cs +++ b/OpenSim/Grid/UserServer/OpenIdService.cs @@ -31,10 +31,8 @@ using System.Collections.Specialized; using System.IO; using System.Net; using System.Web; -using System.Text; using DotNetOpenId; using DotNetOpenId.Provider; -using log4net; using OpenSim.Framework; using OpenSim.Framework.Servers; diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index 0caefb1..905f4aa 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs @@ -30,9 +30,9 @@ using System.Collections; using System.Collections.Generic; using System.Reflection; using System.Text.RegularExpressions; -using OpenMetaverse; using log4net; using Nwc.XmlRpc; +using OpenMetaverse; using OpenSim.Data; using OpenSim.Framework; using OpenSim.Framework.Communications; diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs index 65e19b2..4da5f2e 100644 --- a/OpenSim/Grid/UserServer/UserManager.cs +++ b/OpenSim/Grid/UserServer/UserManager.cs @@ -29,9 +29,9 @@ using System; using System.Collections; using System.Collections.Generic; using System.Reflection; -using OpenMetaverse; using log4net; using Nwc.XmlRpc; +using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Servers; -- cgit v1.1