6 files changed, 130 insertions, 111 deletions

diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
index 1807cc7..941cc30 100644
--- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
+++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs
@@ -26,17 +26,17 @@
 * 
 */
 
+using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework;
 using OpenSim.Framework.Servers;
 
-
 namespace OpenSim.Region.Communications.OGS1
 {
     public class CommunicationsOGS1 : CommunicationsManager
     {
-        public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache ) :base(serversInfo, httpServer, assetCache, false)
+        public CommunicationsOGS1(NetworkServersInfo serversInfo, BaseHttpServer httpServer, AssetCache assetCache)
+            : base(serversInfo, httpServer, assetCache, false)
         {
             OGS1GridServices gridInterComms = new OGS1GridServices(serversInfo, httpServer);
             m_gridService = gridInterComms;
@@ -46,4 +46,4 @@ namespace OpenSim.Region.Communications.OGS1
             m_userService = new OGS1UserServices(this);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 3719c97..d9af95b 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -35,14 +35,12 @@ using System.Runtime.Remoting;
 using System.Runtime.Remoting.Channels;
 using System.Runtime.Remoting.Channels.Tcp;
 using System.Security.Authentication;
-
 using libsecondlife;
 using Nwc.XmlRpc;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework;
 using OpenSim.Region.Communications.Local;
 
 namespace OpenSim.Region.Communications.OGS1
@@ -65,10 +63,10 @@ namespace OpenSim.Region.Communications.OGS1
         {
             serversInfo = servers_info;
             httpServer = httpServe;
-            httpServer.AddXmlRPCHandler("expect_user", this.ExpectUser);
-            httpServer.AddXmlRPCHandler("check", this.PingCheckReply);
+            httpServer.AddXmlRPCHandler("expect_user", ExpectUser);
+            httpServer.AddXmlRPCHandler("check", PingCheckReply);
 
-            this.StartRemoting();
+            StartRemoting();
         }
 
         /// <summary>
@@ -99,14 +97,14 @@ namespace OpenSim.Region.Communications.OGS1
             // Send Request
             XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
             XmlRpcResponse GridResp = GridReq.Send(serversInfo.GridURL, 10000);
-            Hashtable GridRespData = (Hashtable)GridResp.Value;
+            Hashtable GridRespData = (Hashtable) GridResp.Value;
 
             Hashtable griddatahash = GridRespData;
 
             // Process Response
             if (GridRespData.ContainsKey("error"))
             {
-                string errorstring = (string)GridRespData["error"];
+                string errorstring = (string) GridRespData["error"];
                 MainLog.Instance.Error("Unable to connect to grid: " + errorstring);
                 return null;
             }
@@ -121,8 +119,7 @@ namespace OpenSim.Region.Communications.OGS1
         /// <returns></returns>
         public List<SimpleRegionInfo> RequestNeighbours(uint x, uint y)
         {
-
-            Hashtable respData = MapBlockQuery((int)x - 1, (int)y - 1, (int)x + 1, (int)y + 1);
+            Hashtable respData = MapBlockQuery((int) x - 1, (int) y - 1, (int) x + 1, (int) y + 1);
 
             List<SimpleRegionInfo> neighbours = new List<SimpleRegionInfo>();
 
@@ -134,16 +131,15 @@ namespace OpenSim.Region.Communications.OGS1
                     uint regY = Convert.ToUInt32(neighbourData["y"]);
                     if ((x != regX) || (y != regY))
                     {
-
-                        string simIp = (string)neighbourData["sim_ip"];
+                        string simIp = (string) neighbourData["sim_ip"];
 
                         int port = Convert.ToInt32(neighbourData["sim_port"]);
-                        string externalUri = (string)neighbourData["sim_uri"];
+                        string externalUri = (string) neighbourData["sim_uri"];
 
-                        string externalIpStr = OpenSim.Framework.Util.GetHostFromDNS(simIp).ToString();
+                        string externalIpStr = Util.GetHostFromDNS(simIp).ToString();
                         SimpleRegionInfo sri = new SimpleRegionInfo(regX, regY, simIp, port);
                         sri.RemotingPort = Convert.ToUInt32(neighbourData["remoting_port"]);
-                        sri.RegionID = new LLUUID((string)neighbourData["uuid"]);
+                        sri.RegionID = new LLUUID((string) neighbourData["uuid"]);
 
                         neighbours.Add(sri);
                     }
@@ -175,11 +171,11 @@ namespace OpenSim.Region.Communications.OGS1
             {
                 Hashtable requestData = new Hashtable();
                 requestData["region_handle"] = regionHandle.ToString();
-                requestData["authkey"] = this.serversInfo.GridSendKey;
+                requestData["authkey"] = serversInfo.GridSendKey;
                 ArrayList SendParams = new ArrayList();
                 SendParams.Add(requestData);
                 XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
-                XmlRpcResponse GridResp = GridReq.Send(this.serversInfo.GridURL, 3000);
+                XmlRpcResponse GridResp = GridReq.Send(serversInfo.GridURL, 3000);
 
                 Hashtable responseData = (Hashtable) GridResp.Value;
 
@@ -205,7 +201,7 @@ namespace OpenSim.Region.Communications.OGS1
                 regionInfo.RegionID = new LLUUID((string) responseData["region_UUID"]);
                 regionInfo.RegionName = (string) responseData["region_name"];
 
-                m_remoteRegionInfoCache.Add( regionHandle, regionInfo );
+                m_remoteRegionInfoCache.Add(regionHandle, regionInfo);
             }
 
             return regionInfo;
@@ -234,11 +230,11 @@ namespace OpenSim.Region.Communications.OGS1
                     neighbour.X = Convert.ToUInt16(n["x"]);
                     neighbour.Y = Convert.ToUInt16(n["y"]);
 
-                    neighbour.Name = (string)n["name"];
+                    neighbour.Name = (string) n["name"];
                     neighbour.Access = Convert.ToByte(n["access"]);
                     neighbour.RegionFlags = Convert.ToUInt32(n["region-flags"]);
                     neighbour.WaterHeight = Convert.ToByte(n["water-height"]);
-                    neighbour.MapImageId = new LLUUID((string)n["map-image-id"]);
+                    neighbour.MapImageId = new LLUUID((string) n["map-image-id"]);
 
                     neighbours.Add(neighbour);
                 }
@@ -267,7 +263,7 @@ namespace OpenSim.Region.Communications.OGS1
             parameters.Add(param);
             XmlRpcRequest req = new XmlRpcRequest("map_block", parameters);
             XmlRpcResponse resp = req.Send(serversInfo.GridURL, 10000);
-            Hashtable respData = (Hashtable)resp.Value;
+            Hashtable respData = (Hashtable) resp.Value;
             return respData;
         }
 
@@ -300,15 +296,15 @@ namespace OpenSim.Region.Communications.OGS1
         public XmlRpcResponse ExpectUser(XmlRpcRequest request)
         {
             Console.WriteLine("Expecting User...");
-            Hashtable requestData = (Hashtable)request.Params[0];
+            Hashtable requestData = (Hashtable) request.Params[0];
             AgentCircuitData agentData = new AgentCircuitData();
-            agentData.SessionID = new LLUUID((string)requestData["session_id"]);
-            agentData.SecureSessionID = new LLUUID((string)requestData["secure_session_id"]);
-            agentData.firstname = (string)requestData["firstname"];
-            agentData.lastname = (string)requestData["lastname"];
-            agentData.AgentID = new LLUUID((string)requestData["agent_id"]);
+            agentData.SessionID = new LLUUID((string) requestData["session_id"]);
+            agentData.SecureSessionID = new LLUUID((string) requestData["secure_session_id"]);
+            agentData.firstname = (string) requestData["firstname"];
+            agentData.lastname = (string) requestData["lastname"];
+            agentData.AgentID = new LLUUID((string) requestData["agent_id"]);
             agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
-            agentData.CapsPath = (string)requestData["caps_path"];
+            agentData.CapsPath = (string) requestData["caps_path"];
 
             if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
             {
@@ -316,12 +312,14 @@ namespace OpenSim.Region.Communications.OGS1
             }
             else
             {
-                agentData.startpos = new LLVector3(Convert.ToUInt32(requestData["startpos_x"]), Convert.ToUInt32(requestData["startpos_y"]), Convert.ToUInt32(requestData["startpos_z"]));
+                agentData.startpos =
+                    new LLVector3(Convert.ToUInt32(requestData["startpos_x"]),
+                                  Convert.ToUInt32(requestData["startpos_y"]),
+                                  Convert.ToUInt32(requestData["startpos_z"]));
                 agentData.child = false;
-
             }
 
-            ulong regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]);
+            ulong regionHandle = Convert.ToUInt64((string) requestData["regionhandle"]);
 
             m_localBackend.TriggerExpectUser(regionHandle, agentData);
 
@@ -331,6 +329,7 @@ namespace OpenSim.Region.Communications.OGS1
         }
 
         #region m_interRegion Comms
+
         /// <summary>
         /// 
         /// </summary>
@@ -339,13 +338,16 @@ namespace OpenSim.Region.Communications.OGS1
             TcpChannel ch = new TcpChannel(NetworkServersInfo.RemotingListenerPort);
             ChannelServices.RegisterChannel(ch, false); // Disabled security as Mono doesnt support this.
 
-            WellKnownServiceTypeEntry wellType = new WellKnownServiceTypeEntry(typeof(OGS1InterRegionRemoting), "InterRegions", WellKnownObjectMode.Singleton);
+            WellKnownServiceTypeEntry wellType =
+                new WellKnownServiceTypeEntry(typeof (OGS1InterRegionRemoting), "InterRegions",
+                                              WellKnownObjectMode.Singleton);
             RemotingConfiguration.RegisterWellKnownServiceType(wellType);
-            InterRegionSingleton.Instance.OnArrival += this.TriggerExpectAvatarCrossing;
-            InterRegionSingleton.Instance.OnChildAgent += this.IncomingChildAgent;
+            InterRegionSingleton.Instance.OnArrival += TriggerExpectAvatarCrossing;
+            InterRegionSingleton.Instance.OnChildAgent += IncomingChildAgent;
         }
 
         #region Methods called by regions in this instance
+
         /// <summary>
         /// 
         /// </summary>
@@ -361,17 +363,19 @@ namespace OpenSim.Region.Communications.OGS1
                     return true;
                 }
 
-                RegionInfo regInfo = this.RequestNeighbourInfo(regionHandle);
+                RegionInfo regInfo = RequestNeighbourInfo(regionHandle);
                 if (regInfo != null)
                 {
                     //don't want to be creating a new link to the remote instance every time like we are here
                     bool retValue = false;
 
 
-                    OGS1InterRegionRemoting remObject = (OGS1InterRegionRemoting)Activator.GetObject(
-                        typeof(OGS1InterRegionRemoting),
-                        "tcp://" + regInfo.RemotingAddress + ":" + regInfo.RemotingPort + "/InterRegions");
-                    
+                    OGS1InterRegionRemoting remObject = (OGS1InterRegionRemoting) Activator.GetObject(
+                                                                                      typeof (OGS1InterRegionRemoting),
+                                                                                      "tcp://" + regInfo.RemotingAddress +
+                                                                                      ":" + regInfo.RemotingPort +
+                                                                                      "/InterRegions");
+
                     if (remObject != null)
                     {
                         retValue = remObject.InformRegionOfChildAgent(regionHandle, agentData);
@@ -388,7 +392,7 @@ namespace OpenSim.Region.Communications.OGS1
 
                 return false;
             }
-            catch (System.Runtime.Remoting.RemotingException e)
+            catch (RemotingException e)
             {
                 MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString());
                 return false;
@@ -432,13 +436,15 @@ namespace OpenSim.Region.Communications.OGS1
                     return true;
                 }
 
-                RegionInfo regInfo = this.RequestNeighbourInfo(regionHandle);
+                RegionInfo regInfo = RequestNeighbourInfo(regionHandle);
                 if (regInfo != null)
                 {
                     bool retValue = false;
-                    OGS1InterRegionRemoting remObject = (OGS1InterRegionRemoting)Activator.GetObject(
-                        typeof(OGS1InterRegionRemoting),
-                        "tcp://" + regInfo.RemotingAddress + ":" + regInfo.RemotingPort + "/InterRegions");
+                    OGS1InterRegionRemoting remObject = (OGS1InterRegionRemoting) Activator.GetObject(
+                                                                                      typeof (OGS1InterRegionRemoting),
+                                                                                      "tcp://" + regInfo.RemotingAddress +
+                                                                                      ":" + regInfo.RemotingPort +
+                                                                                      "/InterRegions");
                     if (remObject != null)
                     {
                         retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID, position, isFlying);
@@ -455,7 +461,7 @@ namespace OpenSim.Region.Communications.OGS1
                 // to inform it. 
                 return false;
             }
-            catch (System.Runtime.Remoting.RemotingException e)
+            catch (RemotingException e)
             {
                 MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString());
                 return false;
@@ -474,6 +480,7 @@ namespace OpenSim.Region.Communications.OGS1
         #endregion
 
         #region Methods triggered by calls from external instances
+
         /// <summary>
         /// 
         /// </summary>
@@ -486,7 +493,7 @@ namespace OpenSim.Region.Communications.OGS1
             {
                 return m_localBackend.IncomingChildAgent(regionHandle, agentData);
             }
-            catch (System.Runtime.Remoting.RemotingException e)
+            catch (RemotingException e)
             {
                 MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString());
                 return false;
@@ -502,18 +509,19 @@ namespace OpenSim.Region.Communications.OGS1
         /// <returns></returns>
         public bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying)
         {
-
             try
             {
                 return m_localBackend.TriggerExpectAvatarCrossing(regionHandle, agentID, position, isFlying);
             }
-            catch (System.Runtime.Remoting.RemotingException e)
+            catch (RemotingException e)
             {
                 MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString());
                 return false;
             }
         }
+
         #endregion
+
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 0b7bd82..a127010 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -27,17 +27,19 @@
 */
 
 using System;
+using System.Runtime.Remoting;
 using libsecondlife;
 using OpenSim.Framework;
 
 namespace OpenSim.Region.Communications.OGS1
 {
     public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData);
+
     public delegate bool ExpectArrival(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying);
 
     public sealed class InterRegionSingleton
     {
-        static readonly InterRegionSingleton instance = new InterRegionSingleton();
+        private static readonly InterRegionSingleton instance = new InterRegionSingleton();
 
         public event InformRegionChild OnChildAgent;
         public event ExpectArrival OnArrival;
@@ -46,16 +48,13 @@ namespace OpenSim.Region.Communications.OGS1
         {
         }
 
-        InterRegionSingleton()
+        private InterRegionSingleton()
         {
         }
 
         public static InterRegionSingleton Instance
         {
-            get
-            {
-                return instance;
-            }
+            get { return instance; }
         }
 
         public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
@@ -79,7 +78,6 @@ namespace OpenSim.Region.Communications.OGS1
 
     public class OGS1InterRegionRemoting : MarshalByRefObject
     {
-
         public OGS1InterRegionRemoting()
         {
         }
@@ -90,7 +88,7 @@ namespace OpenSim.Region.Communications.OGS1
             {
                 return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData);
             }
-            catch (System.Runtime.Remoting.RemotingException e)
+            catch (RemotingException e)
             {
                 Console.WriteLine("Remoting Error: Unable to connect to remote region.\n" + e.ToString());
                 return false;
@@ -103,11 +101,11 @@ namespace OpenSim.Region.Communications.OGS1
             {
                 return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position, isFlying);
             }
-            catch (System.Runtime.Remoting.RemotingException e)
+            catch (RemotingException e)
             {
                 Console.WriteLine("Remoting Error: Unable to connect to remote region.\n" + e.ToString());
                 return false;
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 11dee2d..49fdee9 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -28,46 +28,39 @@
 
 using System.Collections.Generic;
 using libsecondlife;
+using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework;
-
 
 namespace OpenSim.Region.Communications.OGS1
 {
     public class OGS1InventoryService : IInventoryServices
     {
-
         public OGS1InventoryService()
         {
-
         }
 
         #region IInventoryServices Members
-       
-        public void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack)
+
+        public void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack,
+                                            InventoryItemInfo itemCallBack)
         {
-            
         }
 
         public void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder)
         {
-            
         }
 
         public void AddNewInventoryItem(LLUUID userID, InventoryItemBase item)
         {
-            
         }
 
         public void DeleteInventoryItem(LLUUID userID, InventoryItemBase item)
         {
-            
         }
 
         public void CreateNewUserInventory(LLUUID user)
         {
-            
         }
 
         public List<InventoryFolderBase> RequestFirstLevelFolders(LLUUID userID)
@@ -77,4 +70,4 @@ namespace OpenSim.Region.Communications.OGS1
 
         #endregion
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 19a3c3b..d00a813 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -28,16 +28,19 @@
 
 using System;
 using System.Collections;
+using System.Net;
 using libsecondlife;
 using Nwc.XmlRpc;
-using OpenSim.Framework.Interfaces;
 using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Interfaces;
 
 namespace OpenSim.Region.Communications.OGS1
 {
-    public class OGS1UserServices :IUserService
+    public class OGS1UserServices : IUserService
     {
-        CommunicationsOGS1 m_parent;
+        private CommunicationsOGS1 m_parent;
+
         public OGS1UserServices(CommunicationsOGS1 parent)
         {
             m_parent = parent;
@@ -47,32 +50,41 @@ namespace OpenSim.Region.Communications.OGS1
         {
             if (data.Contains("error_type"))
             {
-                Console.WriteLine("Error sent by user server when trying to get user profile: (" + data["error_type"] + "): " + data["error_desc"]);
+                Console.WriteLine("Error sent by user server when trying to get user profile: (" + data["error_type"] +
+                                  "): " + data["error_desc"]);
                 return null;
             }
 
             UserProfileData userData = new UserProfileData();
-            userData.username = (string)data["firstname"];
-            userData.surname = (string)data["lastname"];
-            userData.UUID = new LLUUID((string)data["uuid"]);
-            userData.userInventoryURI = (string)data["server_inventory"];
-            userData.userAssetURI = (string)data["server_asset"];
-            userData.profileFirstText = (string)data["profile_firstlife_about"];
-            userData.profileFirstImage = new LLUUID((string)data["profile_firstlife_image"]);
-            userData.profileCanDoMask = Convert.ToUInt32((string)data["profile_can_do"]);
+            userData.username = (string) data["firstname"];
+            userData.surname = (string) data["lastname"];
+            userData.UUID = new LLUUID((string) data["uuid"]);
+            userData.userInventoryURI = (string) data["server_inventory"];
+            userData.userAssetURI = (string) data["server_asset"];
+            userData.profileFirstText = (string) data["profile_firstlife_about"];
+            userData.profileFirstImage = new LLUUID((string) data["profile_firstlife_image"]);
+            userData.profileCanDoMask = Convert.ToUInt32((string) data["profile_can_do"]);
             userData.profileWantDoMask = Convert.ToUInt32(data["profile_want_do"]);
-            userData.profileImage = new LLUUID((string)data["profile_image"]);
-            userData.lastLogin = Convert.ToInt32((string)data["profile_lastlogin"]);
-            userData.homeRegion = Convert.ToUInt64((string)data["home_region"]);
-            userData.homeLocation = new LLVector3((float)Convert.ToDecimal((string)data["home_coordinates_x"]), (float)Convert.ToDecimal((string)data["home_coordinates_y"]), (float)Convert.ToDecimal((string)data["home_coordinates_z"]));
-            userData.homeLookAt = new LLVector3((float)Convert.ToDecimal((string)data["home_look_x"]), (float)Convert.ToDecimal((string)data["home_look_y"]), (float)Convert.ToDecimal((string)data["home_look_z"]));
+            userData.profileImage = new LLUUID((string) data["profile_image"]);
+            userData.lastLogin = Convert.ToInt32((string) data["profile_lastlogin"]);
+            userData.homeRegion = Convert.ToUInt64((string) data["home_region"]);
+            userData.homeLocation =
+                new LLVector3((float) Convert.ToDecimal((string) data["home_coordinates_x"]),
+                              (float) Convert.ToDecimal((string) data["home_coordinates_y"]),
+                              (float) Convert.ToDecimal((string) data["home_coordinates_z"]));
+            userData.homeLookAt =
+                new LLVector3((float) Convert.ToDecimal((string) data["home_look_x"]),
+                              (float) Convert.ToDecimal((string) data["home_look_y"]),
+                              (float) Convert.ToDecimal((string) data["home_look_z"]));
 
             return userData;
         }
+
         public UserProfileData GetUserProfile(string firstName, string lastName)
         {
             return GetUserProfile(firstName + " " + lastName);
         }
+
         public UserProfileData GetUserProfile(string name)
         {
             try
@@ -83,16 +95,18 @@ namespace OpenSim.Region.Communications.OGS1
                 parameters.Add(param);
                 XmlRpcRequest req = new XmlRpcRequest("get_user_by_name", parameters);
                 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000);
-                Hashtable respData = (Hashtable)resp.Value;
+                Hashtable respData = (Hashtable) resp.Value;
 
                 return ConvertXMLRPCDataToUserProfile(respData);
             }
-            catch (System.Net.WebException e)
+            catch (WebException e)
             {
-                OpenSim.Framework.Console.MainLog.Instance.Warn("Error when trying to fetch profile data by name from remote user server: " + e.Message);
+                MainLog.Instance.Warn("Error when trying to fetch profile data by name from remote user server: " +
+                                      e.Message);
             }
             return null;
         }
+
         public UserProfileData GetUserProfile(LLUUID avatarID)
         {
             try
@@ -103,18 +117,19 @@ namespace OpenSim.Region.Communications.OGS1
                 parameters.Add(param);
                 XmlRpcRequest req = new XmlRpcRequest("get_user_by_uuid", parameters);
                 XmlRpcResponse resp = req.Send(m_parent.NetworkServersInfo.UserURL, 3000);
-                Hashtable respData = (Hashtable)resp.Value;
+                Hashtable respData = (Hashtable) resp.Value;
 
                 return ConvertXMLRPCDataToUserProfile(respData);
             }
             catch (Exception e)
             {
-                Console.WriteLine("Error when trying to fetch profile data by uuid from remote user server: " + e.Message);
+                Console.WriteLine("Error when trying to fetch profile data by uuid from remote user server: " +
+                                  e.Message);
             }
             return null;
         }
 
-        public void clearUserAgent(LLUUID avatarID) 
+        public void clearUserAgent(LLUUID avatarID)
         {
             // TODO: implement
         }
@@ -135,4 +150,4 @@ namespace OpenSim.Region.Communications.OGS1
             throw new Exception("The method or operation is not implemented.");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
index 2bebf9f..631cfd0 100644
--- a/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs
@@ -1,24 +1,28 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
+
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenGrid.Framework.Communications.OGS1")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenGrid.Framework.Communications.OGS1")]
-[assembly: AssemblyCopyright("Copyright ©  2007")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+
+[assembly : AssemblyTitle("OpenGrid.Framework.Communications.OGS1")]
+[assembly : AssemblyDescription("")]
+[assembly : AssemblyConfiguration("")]
+[assembly : AssemblyCompany("")]
+[assembly : AssemblyProduct("OpenGrid.Framework.Communications.OGS1")]
+[assembly : AssemblyCopyright("Copyright ©  2007")]
+[assembly : AssemblyTrademark("")]
+[assembly : AssemblyCulture("")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+
+[assembly : ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("a8b2b39b-c83b-41e2-b0b5-7ccfc1fddae7")]
+
+[assembly : Guid("a8b2b39b-c83b-41e2-b0b5-7ccfc1fddae7")]
 
 // Version information for an assembly consists of the following four values:
 //
@@ -29,5 +33,6 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly : AssemblyVersion("1.0.0.0")]
+[assembly : AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file