1 files changed, 39 insertions, 24 deletions

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