4 files changed, 26 insertions, 27 deletions

diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 0f0104e..0534e3b 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -28,7 +28,11 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net;
+using System.Reflection;
 using libsecondlife;
+using log4net;
+using log4net.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Console;
@@ -41,7 +45,7 @@ namespace OpenSim.Grid.UserServer
     /// </summary>
     public class OpenUser_Main : BaseOpenSimServer, conscmd_callback
     {
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private UserConfig Cfg;
         
@@ -54,7 +58,7 @@ namespace OpenSim.Grid.UserServer
         [STAThread]
         public static void Main(string[] args)
         {
-            log4net.Config.XmlConfigurator.Configure();
+            XmlConfigurator.Configure();
 
             m_log.Info("Launching UserServer...");
 
@@ -191,7 +195,7 @@ namespace OpenSim.Grid.UserServer
                         }
                        
                     }
-                    catch (System.Net.WebException e)
+                    catch (WebException e)
                     {
                         m_log.ErrorFormat(
                             "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}", 
diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs
index 6355c4d..22505cb 100644
--- a/OpenSim/Grid/UserServer/MessageServersConnector.cs
+++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs
@@ -25,23 +25,20 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Text;
-using System.Threading;
+using System.Net;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using Nwc.XmlRpc;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 
 namespace OpenSim.Grid.UserServer
 {
     public class MessageServersConnector
     {
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public Dictionary<string, MessageServerInfo> MessageServers;
         
@@ -214,7 +211,7 @@ namespace OpenSim.Grid.UserServer
             {
                 XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000);
             }
-            catch (System.Net.WebException)
+            catch (WebException)
             {
                 m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about log out.  Other users might still think this user is online");
             }
@@ -249,7 +246,7 @@ namespace OpenSim.Grid.UserServer
                 XmlRpcResponse GridResp = GridReq.Send(serv.URI, 6000);
                 m_log.Info("[LOGIN]: Notified : " + serv.URI + " about user login");
             }
-            catch (System.Net.WebException)
+            catch (WebException)
             {
                 m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about login.  Presence might be borked for this user");
             }
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index d7a3b1a..f294dcf 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -28,18 +28,15 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Threading;
+using System.Reflection;
 using libsecondlife;
+using log4net;
 using Nwc.XmlRpc;
-
+using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Console;
-using OpenSim.Data;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Statistics;
 using OpenSim.Framework.UserManagement;
-using InventoryFolder=OpenSim.Framework.InventoryFolder;
 
 namespace OpenSim.Grid.UserServer
 {
@@ -48,7 +45,7 @@ namespace OpenSim.Grid.UserServer
 
     public class UserLoginService : LoginService
     {
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public event UserLoggedInAtLocation OnUserLoggedInAtLocation;
 
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 2a53d7b..aa2c959 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -28,11 +28,12 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Text.RegularExpressions;
 using libsecondlife;
+using log4net;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
-using OpenSim.Framework.Statistics;
 using OpenSim.Framework.UserManagement;
 
 namespace OpenSim.Grid.UserServer
@@ -41,7 +42,7 @@ namespace OpenSim.Grid.UserServer
 
     public class UserManager : UserManagerBase
     {            
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public event logOffUser OnLogOffUser;
         private logOffUser handlerLogOffUser = null;
@@ -389,7 +390,7 @@ namespace OpenSim.Grid.UserServer
                 {
                     userProfile.HomeLocationX = (float)Convert.ToDecimal((string)requestData["home_pos_x"]);
                 }
-                catch (System.InvalidCastException)
+                catch (InvalidCastException)
                 {
                     m_log.Error("[PROFILE]:Failed to set home postion x");
                 }
@@ -401,7 +402,7 @@ namespace OpenSim.Grid.UserServer
                 {
                     userProfile.HomeLocationY = (float)Convert.ToDecimal((string)requestData["home_pos_y"]);
                 }
-                catch (System.InvalidCastException)
+                catch (InvalidCastException)
                 {
                     m_log.Error("[PROFILE]:Failed to set home postion y");
                 }
@@ -412,7 +413,7 @@ namespace OpenSim.Grid.UserServer
                 {
                     userProfile.HomeLocationZ = (float)Convert.ToDecimal((string)requestData["home_pos_z"]);
                 }
-                catch (System.InvalidCastException)
+                catch (InvalidCastException)
                 {
                     m_log.Error("[PROFILE]:Failed to set home postion z");
                 }
@@ -423,7 +424,7 @@ namespace OpenSim.Grid.UserServer
                 {
                     userProfile.HomeLookAtX = (float)Convert.ToDecimal((string)requestData["home_look_x"]);
                 }
-                catch (System.InvalidCastException)
+                catch (InvalidCastException)
                 {
                     m_log.Error("[PROFILE]:Failed to set home lookat x");
                 }
@@ -434,7 +435,7 @@ namespace OpenSim.Grid.UserServer
                 {
                     userProfile.HomeLookAtY = (float)Convert.ToDecimal((string)requestData["home_look_y"]);
                 }
-                catch (System.InvalidCastException)
+                catch (InvalidCastException)
                 {
                     m_log.Error("[PROFILE]:Failed to set home lookat y");
                 }
@@ -445,7 +446,7 @@ namespace OpenSim.Grid.UserServer
                 {
                     userProfile.HomeLookAtZ = (float)Convert.ToDecimal((string)requestData["home_look_z"]);
                 }
-                catch (System.InvalidCastException)
+                catch (InvalidCastException)
                 {
                     m_log.Error("[PROFILE]:Failed to set home lookat z");
                 }