5 files changed, 74 insertions, 74 deletions

diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 00b7f76..79524b4 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -48,10 +48,10 @@ namespace OpenSim.Grid.UserServer
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private UserConfig Cfg;
-        
+
         public UserManager m_userManager;
         public UserLoginService m_loginService;
-        public MessageServersConnector m_messagesService;        
+        public MessageServersConnector m_messagesService;
 
         private LLUUID m_lastCreatedUser = LLUUID.Random();
 
@@ -87,13 +87,13 @@ namespace OpenSim.Grid.UserServer
         public void Startup()
         {
             Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
-            
+
             m_stats = StatsManager.StartCollectingUserStats();
 
             m_log.Info("[REGION]: Establishing data connection");
-            m_userManager = new UserManager();            
+            m_userManager = new UserManager();
             m_userManager._config = Cfg;
-            m_userManager.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect);            
+            m_userManager.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect);
 
             m_loginService = new UserLoginService(
                  m_userManager, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg);
@@ -104,7 +104,7 @@ namespace OpenSim.Grid.UserServer
             m_userManager.OnLogOffUser += NotifyMessageServersUserLoggOff;
 
             m_log.Info("[REGION]: Starting HTTP process");
-            
+
             m_httpServer = new BaseHttpServer(Cfg.HttpPort);
             AddHttpHandlers();
             m_httpServer.Start();
@@ -117,7 +117,7 @@ namespace OpenSim.Grid.UserServer
             m_httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod);
 
             m_httpServer.AddHTTPHandler("login", m_loginService.ProcessHTMLLogin);
-            
+
             m_httpServer.SetLLSDHandler(m_loginService.LLSDLoginMethod);
 
             m_httpServer.AddXmlRPCHandler("get_user_by_name", m_userManager.XmlRPCGetUserMethodName);
@@ -128,7 +128,7 @@ namespace OpenSim.Grid.UserServer
             m_httpServer.AddXmlRPCHandler("update_user_friend_perms", m_userManager.XmlRpcResponseXmlRPCUpdateUserFriendPerms);
             m_httpServer.AddXmlRPCHandler("get_user_friend_list", m_userManager.XmlRpcResponseXmlRPCGetUserFriendList);
             m_httpServer.AddXmlRPCHandler("logout_of_simulator", m_userManager.XmlRPCLogOffUserMethodUUID);
-           
+
             // Message Server ---> User Server
             m_httpServer.AddXmlRPCHandler("register_messageserver", m_messagesService.XmlRPCRegisterMessageServer);
             m_httpServer.AddXmlRPCHandler("agent_change_region", m_messagesService.XmlRPCUserMovedtoRegion);
@@ -163,17 +163,17 @@ namespace OpenSim.Grid.UserServer
                     {
                         m_log.ErrorFormat(
                             "[USERS]: A user with the name {0} {1} already exists!", tempfirstname, templastname);
-                    
+
                         break;
                     }
-                    
+
                     tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty);
 
                     LLUUID userID = new LLUUID();
                     try
                     {
                         userID = m_userManager.AddUserProfile(tempfirstname, templastname, tempMD5Passwd, regX, regY);
-                    } 
+                    }
                     catch (Exception ex)
                     {
                         m_log.ErrorFormat("[USERS]: Error creating user: {0}", ex.ToString());
@@ -181,31 +181,31 @@ namespace OpenSim.Grid.UserServer
 
                     try
                     {
-                        bool created 
+                        bool created
                             = SynchronousRestObjectPoster.BeginPostObject<Guid, bool>(
                                 "POST", m_userManager._config.InventoryUrl + "CreateInventory/", userID.UUID);
-                    
+
                         if (!created)
                         {
                             throw new Exception(
                                 String.Format(
                                     "The inventory creation request for user {0} did not succeed."
-                                        + "  Please contact your inventory service provider for more information.", 
+                                        + "  Please contact your inventory service provider for more information.",
                                     userID));
                         }
-                       
+
                     }
                     catch (WebException)
                     {
                         m_log.ErrorFormat(
-                            "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}", 
+                            "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}",
                             m_userManager._config.InventoryUrl + "CreateInventory/", userID.UUID);
                     }
                     catch (Exception e)
                     {
                         m_log.ErrorFormat("[USERS]: Error creating inventory for user: {0}", e);
                     }
-                
+
                     m_lastCreatedUser = userID;
                     break;
             }
@@ -214,7 +214,7 @@ namespace OpenSim.Grid.UserServer
         public override void RunCmd(string cmd, string[] cmdparams)
         {
             base.RunCmd(cmd, cmdparams);
-            
+
             switch (cmd)
             {
                 case "help":
@@ -223,7 +223,7 @@ namespace OpenSim.Grid.UserServer
 
                 case "create":
                     do_create(cmdparams[0]);
-                    break;                  
+                    break;
 
                 case "test-inventory":
                     //  RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>();
@@ -242,10 +242,10 @@ namespace OpenSim.Grid.UserServer
         public override void Shutdown()
         {
             m_loginService.OnUserLoggedInAtLocation -= NotifyMessageServersUserLoggedInToLocation;
-            
+
             base.Shutdown();
         }
-        
+
         public void TestResponse(List<InventoryFolderBase> resp)
         {
             m_console.Notice("response got");
@@ -257,10 +257,10 @@ namespace OpenSim.Grid.UserServer
         }
 
         public void NotifyMessageServersUserLoggedInToLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
-                                                                ulong regionhandle, float positionX, float positionY, 
+                                                                ulong regionhandle, float positionX, float positionY,
                                                                 float positionZ, string firstname, string lastname)
         {
-            
+
             m_messagesService.TellMessageServersAboutUser(agentID, sessionID, RegionID, regionhandle, positionX,
                                                           positionY,  positionZ, firstname, lastname);
         }
diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs
index 4e9728e..529c089 100644
--- a/OpenSim/Grid/UserServer/MessageServersConnector.cs
+++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs
@@ -41,12 +41,12 @@ namespace OpenSim.Grid.UserServer
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public Dictionary<string, MessageServerInfo> MessageServers;
-        
+
         public MessageServersConnector()
         {
             MessageServers = new Dictionary<string, MessageServerInfo>();
         }
-        
+
         public void RegisterMessageServer(string URI, MessageServerInfo serverData)
         {
             lock (MessageServers)
@@ -55,7 +55,7 @@ namespace OpenSim.Grid.UserServer
                     MessageServers.Add(URI, serverData);
             }
         }
-        
+
         public void DeRegisterMessageServer(string URI)
         {
             lock (MessageServers)
@@ -64,7 +64,7 @@ namespace OpenSim.Grid.UserServer
                     MessageServers.Remove(URI);
             }
         }
-        
+
         public void AddResponsibleRegion(string URI, ulong regionhandle)
         {
             if (!MessageServers.ContainsKey(URI))
@@ -76,7 +76,7 @@ namespace OpenSim.Grid.UserServer
                 MessageServerInfo msginfo = MessageServers["URI"];
                 msginfo.responsibleForRegions.Add(regionhandle);
                 MessageServers["URI"] = msginfo;
-            }   
+            }
         }
         public void RemoveResponsibleRegion(string URI, ulong regionhandle)
         {
@@ -92,7 +92,7 @@ namespace OpenSim.Grid.UserServer
                     msginfo.responsibleForRegions.Remove(regionhandle);
                     MessageServers["URI"] = msginfo;
                 }
-            }   
+            }
 
         }
         public XmlRpcResponse XmlRPCRegisterMessageServer(XmlRpcRequest request)
@@ -148,7 +148,7 @@ namespace OpenSim.Grid.UserServer
                 string scurrentpos = (string)requestData["currentpos"];
                 //LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos);
                 // TODO: Okay now raise event so the user server can pass this data to the Usermanager
-                
+
                 responseData["responsestring"] = "TRUE";
                 response.Value = responseData;
             }
@@ -156,7 +156,7 @@ namespace OpenSim.Grid.UserServer
         }
 
         public void TellMessageServersAboutUser(LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
-                                                ulong regionhandle, float positionX, float positionY, 
+                                                ulong regionhandle, float positionX, float positionY,
                                                 float positionZ, string firstname, string lastname)
         {
             // Loop over registered Message Servers (AND THERE WILL BE MORE THEN ONE :D)
@@ -218,9 +218,9 @@ namespace OpenSim.Grid.UserServer
             m_log.Info("[LOGOUT]: Notified : " + serv.URI + " about user logout");
         }
 
-        private void NotifyMessageServerAboutUser(MessageServerInfo serv, 
+        private void NotifyMessageServerAboutUser(MessageServerInfo serv,
                                                     LLUUID agentID, LLUUID sessionID, LLUUID RegionID,
-                                                    ulong regionhandle, float positionX, float positionY, float positionZ, 
+                                                    ulong regionhandle, float positionX, float positionY, float positionZ,
                                                     string firstname, string lastname)
         {
             Hashtable reqparams = new Hashtable();
@@ -250,7 +250,7 @@ namespace OpenSim.Grid.UserServer
             {
                 m_log.Warn("[MSGCONNECTOR]: Unable to notify Message Server about login.  Presence might be borked for this user");
             }
-            
+
         }
     }
 }
diff --git a/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
index 680b357..926f680 100644
--- a/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/UserServer/Properties/AssemblyInfo.cs
@@ -28,7 +28,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// 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.
 
@@ -41,8 +41,8 @@ using System.Runtime.InteropServices;
 [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 
+// 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)]
@@ -54,7 +54,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 32b1ada..3c9d650 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -50,11 +50,11 @@ namespace OpenSim.Grid.UserServer
         public event UserLoggedInAtLocation OnUserLoggedInAtLocation;
 
         private UserLoggedInAtLocation handlerUserLoggedInAtLocation = null;
-       
+
         public UserConfig m_config;
 
         public UserLoginService(
-            UserManagerBase userManager, LibraryRootFolder libraryRootFolder, 
+            UserManagerBase userManager, LibraryRootFolder libraryRootFolder,
             UserConfig config, string welcomeMess)
             : base(userManager, libraryRootFolder, welcomeMess)
         {
@@ -138,9 +138,9 @@ namespace OpenSim.Grid.UserServer
                                 theUser.HomeLocation.Y.ToString() + ",r" + theUser.HomeLocation.Z.ToString() + "]}";
 
                 // Destination
-                //CFK: The "Notifying" message always seems to appear, so subsume the data from this message into 
+                //CFK: The "Notifying" message always seems to appear, so subsume the data from this message into
                 //CFK: the next one for X & Y and comment this one.
-                //CFK: m_log.Info("[LOGIN]: CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + 
+                //CFK: m_log.Info("[LOGIN]: CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX +
                 //CFK: "; Region Y: " + SimInfo.regionLocY);
                 response.SimAddress = Util.GetHostFromDNS(SimInfo.serverURI.Split(new char[] { '/', ':' })[3]).ToString();
                 response.SimPort = uint.Parse(SimInfo.serverURI.Split(new char[] { '/', ':' })[4]);
@@ -150,15 +150,15 @@ namespace OpenSim.Grid.UserServer
                 //Not sure if the + "/CAPS/" should in fact be +"CAPS/" depending if there is already a / as part of httpServerURI
                 string capsPath = Util.GetRandomCapsPath();
                 response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/";
-                
+
                 m_log.DebugFormat(
-                    "[LOGIN]: Sending new CAPS seed url {0} to client {1}", 
-                    response.SeedCapability, response.AgentID);                 
+                    "[LOGIN]: Sending new CAPS seed url {0} to client {1}",
+                    response.SeedCapability, response.AgentID);
 
                 // Notify the target of an incoming user
-                //CFK: The "Notifying" message always seems to appear, so subsume the data from this message into 
+                //CFK: The "Notifying" message always seems to appear, so subsume the data from this message into
                 //CFK: the next one for X & Y and comment this one.
-                //CFK: m_log.Info("[LOGIN]: " + SimInfo.regionName + " (" + SimInfo.serverURI + ")  " + 
+                //CFK: m_log.Info("[LOGIN]: " + SimInfo.regionName + " (" + SimInfo.serverURI + ")  " +
                 //CFK:    SimInfo.regionLocX + "," + SimInfo.regionLocY);
 
                 theUser.CurrentAgent.Region = SimInfo.UUID;
@@ -187,23 +187,23 @@ namespace OpenSim.Grid.UserServer
                 // Update agent with target sim
 
                 m_log.InfoFormat(
-                    "[LOGIN]: Telling region {0} @ {1},{2} ({3}) to expect user connection", 
-                    SimInfo.regionName, response.RegionX, response.RegionY, SimInfo.httpServerURI); 
+                    "[LOGIN]: Telling region {0} @ {1},{2} ({3}) to expect user connection",
+                    SimInfo.regionName, response.RegionX, response.RegionY, SimInfo.httpServerURI);
 
-                XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);                
+                XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
                 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);
-                
+
                 if (GridResp.IsFault)
                 {
                     m_log.ErrorFormat(
-                        "[LOGIN]: XMLRPC request for {0} failed, fault code: {1}, reason: {2}", 
+                        "[LOGIN]: XMLRPC request for {0} failed, fault code: {1}, reason: {2}",
                         SimInfo.httpServerURI, GridResp.FaultCode, GridResp.FaultString);
                 }
                 handlerUserLoggedInAtLocation = OnUserLoggedInAtLocation;
                 if (handlerUserLoggedInAtLocation != null)
                 {
                     //m_log.Info("[LOGIN]: Letting other objects know about login");
-                    handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.SessionID, theUser.CurrentAgent.Region, 
+                    handlerUserLoggedInAtLocation(theUser.ID, theUser.CurrentAgent.SessionID, theUser.CurrentAgent.Region,
                         theUser.CurrentAgent.Handle, theUser.CurrentAgent.Position.X,theUser.CurrentAgent.Position.Y,theUser.CurrentAgent.Position.Z,
                         theUser.FirstName,theUser.SurName);
                 }
@@ -213,7 +213,7 @@ namespace OpenSim.Grid.UserServer
             {
                 tryDefault = true;
             }
-            
+
             if (tryDefault)
             {
                 // Send him to default region instead
@@ -301,8 +301,8 @@ namespace OpenSim.Grid.UserServer
         protected override InventoryData GetInventorySkeleton(LLUUID userID)
         {
             m_log.DebugFormat(
-                 "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}", 
-                 m_config.InventoryUrl, userID);            
+                 "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}",
+                 m_config.InventoryUrl, userID);
 
             List<InventoryFolderBase> folders
                 = SynchronousRestObjectPoster.BeginPostObject<Guid, List<InventoryFolderBase>>(
@@ -317,23 +317,23 @@ namespace OpenSim.Grid.UserServer
                 // tools are creating the user profile directly in the database without creating the inventory.  At
                 // this time we'll accomodate them by lazily creating the user inventory now if it doesn't already
                 // exist.
-                bool created = 
+                bool created =
                     SynchronousRestObjectPoster.BeginPostObject<Guid, bool>(
                         "POST", m_config.InventoryUrl + "CreateInventory/", userID.UUID);
-                
+
                 if (!created)
                 {
                     throw new Exception(
                         String.Format(
                             "The inventory creation request for user {0} did not succeed."
-                                + "  Please contact your inventory service provider for more information.", 
+                                + "  Please contact your inventory service provider for more information.",
                             userID));
                 }
                 else
                 {
                     m_log.InfoFormat("[LOGIN]: A new inventory skeleton was successfully created for user {0}", userID);
                 }
-                
+
                 folders = SynchronousRestObjectPoster.BeginPostObject<Guid, List<InventoryFolderBase>>(
                     "POST", m_config.InventoryUrl + "RootFolders/", userID.UUID);
             }
@@ -343,11 +343,11 @@ namespace OpenSim.Grid.UserServer
                 LLUUID rootID = LLUUID.Zero;
                 ArrayList AgentInventoryArray = new ArrayList();
                 Hashtable TempHash;
-                
+
                 foreach (InventoryFolderBase InvFolder in folders)
                 {
 //                    m_log.DebugFormat("[LOGIN]: Received agent inventory folder {0}", InvFolder.name);
-                    
+
                     if (InvFolder.ParentID == LLUUID.Zero)
                     {
                         rootID = InvFolder.ID;
@@ -360,14 +360,14 @@ namespace OpenSim.Grid.UserServer
                     TempHash["folder_id"] = InvFolder.ID.ToString();
                     AgentInventoryArray.Add(TempHash);
                 }
-                
+
                 return new InventoryData(AgentInventoryArray, rootID);
             }
             else
             {
                 throw new Exception(
                     String.Format(
-                        "A root inventory folder for user {0} could not be retrieved from the inventory service", 
+                        "A root inventory folder for user {0} could not be retrieved from the inventory service",
                         userID));
             }
         }
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 5d0e1d6..8372d6a 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Grid.UserServer
     public delegate void logOffUser(LLUUID AgentID);
 
     public class UserManager : UserManagerBase
-    {            
+    {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public event logOffUser OnLogOffUser;
@@ -91,7 +91,7 @@ namespace OpenSim.Grid.UserServer
                 responseData["lastname" + i.ToString()] = returnUsers[i].lastName;
             }
             response.Value = responseData;
-            
+
             return response;
         }
 
@@ -182,7 +182,7 @@ namespace OpenSim.Grid.UserServer
             Hashtable responseData = new Hashtable();
             string returnString = "FALSE";
             // Query Result Information
-            
+
             if (requestData.Contains("ownerID") && requestData.Contains("friendID") && requestData.Contains("friendPerms"))
             {
                 // UserManagerBase.AddNewuserFriend
@@ -201,7 +201,7 @@ namespace OpenSim.Grid.UserServer
             Hashtable responseData = new Hashtable();
             string returnString = "FALSE";
             // Query Result Information
-            
+
             if (requestData.Contains("ownerID") && requestData.Contains("friendID"))
             {
                 // UserManagerBase.AddNewuserFriend
@@ -219,7 +219,7 @@ namespace OpenSim.Grid.UserServer
             Hashtable requestData = (Hashtable)request.Params[0];
             Hashtable responseData = new Hashtable();
             string returnString = "FALSE";
-           
+
             if (requestData.Contains("ownerID") && requestData.Contains("friendID") && requestData.Contains("friendPerms"))
             {
                 UpdateUserFriendPerms(new LLUUID((string)requestData["ownerID"]), new LLUUID((string)requestData["friendID"]), (uint)Convert.ToInt32((string)requestData["friendPerms"]));
@@ -243,7 +243,7 @@ namespace OpenSim.Grid.UserServer
             {
                 returndata = this.GetUserFriendList(new LLUUID((string)requestData["ownerID"]));
             }
-            
+
             return FriendListItemListtoXmlRPCResponse(returndata);
         }
 
@@ -350,7 +350,7 @@ namespace OpenSim.Grid.UserServer
             }
             // dont' know how yet
             if (requestData.Contains("MaturePublish"))
-            {                
+            {
             }
             if (requestData.Contains("AboutText"))
             {
@@ -362,7 +362,7 @@ namespace OpenSim.Grid.UserServer
             }
             // not in DB yet.
             if (requestData.Contains("ProfileURL"))
-            {                
+            {
             }
             if (requestData.Contains("home_region"))
             {
@@ -382,7 +382,7 @@ namespace OpenSim.Grid.UserServer
                 {
                     m_log.Error("[PROFILE]:Failed to set home region, Value was too large");
                 }
-                
+
             }
             if (requestData.Contains("home_pos_x"))
             {
@@ -442,7 +442,7 @@ namespace OpenSim.Grid.UserServer
             }
             if (requestData.Contains("home_look_z"))
             {
-                try 
+                try
                 {
                     userProfile.HomeLookAtZ = (float)Convert.ToDecimal((string)requestData["home_look_z"]);
                 }