== The "right name and place" commit ==

* Moved InventoryData to Framework.Types/InventoryItemBase.cs
* Moved UserData to Framework.Interfaces/IUserData.cs
* Moved UserProfileData to Framework/Types/UserProfileData.cs
* Deleted ass-backwards Framework dependency on Framework.Data (now it's the other way round)
* Changed some namespaces to reflect file structure

2 files changed, 82 insertions, 81 deletions

diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 95192e3..b42427b 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -1,83 +1,84 @@
-using System;
-using System.Collections;
-using System.Net;
-using Nwc.XmlRpc;
-using OpenSim.Framework.Data;
-using OpenSim.Framework.UserManagement;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Configuration;
-
-namespace OpenSim.Grid.UserServer
-{
-    public class UserLoginService : LoginService
-    {
-        public UserConfig m_config;
-
-        public UserLoginService(UserManagerBase userManager, UserConfig config, string welcomeMess)
-            : base(userManager, welcomeMess)
-        {
-            m_config = config;
-        }
-
-        /// <summary>
-        /// Customises the login response and fills in missing values.
-        /// </summary>
-        /// <param name="response">The existing response</param>
-        /// <param name="theUser">The user profile</param>
-        public override void CustomiseResponse(LoginResponse response, UserProfileData theUser)
-        {
-            // Load information from the gridserver
-            SimProfileData SimInfo = new SimProfileData();
-            SimInfo = SimInfo.RequestSimProfileData(theUser.currentAgent.currentHandle, m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey);
-
-            // Customise the response
-            // Home Location
-            response.Home = "{'region_handle':[r" + (SimInfo.regionLocX * 256).ToString() + ",r" + (SimInfo.regionLocY * 256).ToString() + "], " +
-                "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
-                "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
-
-            // Destination
-            Console.WriteLine("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + SimInfo.regionLocY);
-            response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString();
-            response.SimPort = (Int32)SimInfo.serverPort;
-            response.RegionX = SimInfo.regionLocX;
-            response.RegionY = SimInfo.regionLocY;
-
-            //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/";
-
-            // Notify the target of an incoming user
-            Console.WriteLine("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")");
-
-            // Prepare notification
-            Hashtable SimParams = new Hashtable();
-            SimParams["session_id"] = theUser.currentAgent.sessionID.ToString();
-            SimParams["secure_session_id"] = theUser.currentAgent.secureSessionID.ToString();
-            SimParams["firstname"] = theUser.username;
-            SimParams["lastname"] = theUser.surname;
-            SimParams["agent_id"] = theUser.UUID.ToString();
-            SimParams["circuit_code"] = (Int32)Convert.ToUInt32(response.CircuitCode);
-            SimParams["startpos_x"] = theUser.currentAgent.currentPos.X.ToString();
-            SimParams["startpos_y"] = theUser.currentAgent.currentPos.Y.ToString();
-            SimParams["startpos_z"] = theUser.currentAgent.currentPos.Z.ToString();
-            SimParams["regionhandle"] = theUser.currentAgent.currentHandle.ToString();
-            SimParams["caps_path"] = capsPath;
-            ArrayList SendParams = new ArrayList();
-            SendParams.Add(SimParams);
-
-            // Update agent with target sim
-            theUser.currentAgent.currentRegion = SimInfo.UUID;
-            theUser.currentAgent.currentHandle = SimInfo.regionHandle;
-
-            System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI);
+using System;

+using System.Collections;

+using System.Net;

+using Nwc.XmlRpc;

+using OpenSim.Framework.Data;

+using OpenSim.Framework.UserManagement;

+using OpenSim.Framework.Utilities;

+using OpenSim.Framework.Configuration;

+using OpenSim.Framework.Types;

+

+namespace OpenSim.Grid.UserServer

+{

+    public class UserLoginService : LoginService

+    {

+        public UserConfig m_config;

+

+        public UserLoginService(UserManagerBase userManager, UserConfig config, string welcomeMess)

+            : base(userManager, welcomeMess)

+        {

+            m_config = config;

+        }

+

+        /// <summary>

+        /// Customises the login response and fills in missing values.

+        /// </summary>

+        /// <param name="response">The existing response</param>

+        /// <param name="theUser">The user profile</param>

+        public override void CustomiseResponse(LoginResponse response, UserProfileData theUser)

+        {

+            // Load information from the gridserver

+            SimProfileData SimInfo = new SimProfileData();

+            SimInfo = SimInfo.RequestSimProfileData(theUser.currentAgent.currentHandle, m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey);

+

+            // Customise the response

+            // Home Location

+            response.Home = "{'region_handle':[r" + (SimInfo.regionLocX * 256).ToString() + ",r" + (SimInfo.regionLocY * 256).ToString() + "], " +

+                "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +

+                "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";

+

+            // Destination

+            Console.WriteLine("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + SimInfo.regionLocY);

+            response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString();

+            response.SimPort = (Int32)SimInfo.serverPort;

+            response.RegionX = SimInfo.regionLocX;

+            response.RegionY = SimInfo.regionLocY;

+

+            //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/";

+

+            // Notify the target of an incoming user

+            Console.WriteLine("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")");

+

+            // Prepare notification

+            Hashtable SimParams = new Hashtable();

+            SimParams["session_id"] = theUser.currentAgent.sessionID.ToString();

+            SimParams["secure_session_id"] = theUser.currentAgent.secureSessionID.ToString();

+            SimParams["firstname"] = theUser.username;

+            SimParams["lastname"] = theUser.surname;

+            SimParams["agent_id"] = theUser.UUID.ToString();

+            SimParams["circuit_code"] = (Int32)Convert.ToUInt32(response.CircuitCode);

+            SimParams["startpos_x"] = theUser.currentAgent.currentPos.X.ToString();

+            SimParams["startpos_y"] = theUser.currentAgent.currentPos.Y.ToString();

+            SimParams["startpos_z"] = theUser.currentAgent.currentPos.Z.ToString();

+            SimParams["regionhandle"] = theUser.currentAgent.currentHandle.ToString();

+            SimParams["caps_path"] = capsPath;

+            ArrayList SendParams = new ArrayList();

+            SendParams.Add(SimParams);

+

+            // Update agent with target sim

+            theUser.currentAgent.currentRegion = SimInfo.UUID;

+            theUser.currentAgent.currentHandle = SimInfo.regionHandle;

+

+            System.Console.WriteLine("Informing region --> " + SimInfo.httpServerURI);

             // Send

             try

             {

                 XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);

                 XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000);

-            }
-            catch( WebException e )
+            }

+            catch( WebException e )

             {

                 switch( e.Status )

                 {

@@ -88,8 +89,8 @@ namespace OpenSim.Grid.UserServer
                     default:

                         throw;

                 }

-            }
-        }
-    }
-}
-
+            }

+        }

+    }

+}

+

diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 1fbd421..5db4901 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections;
 using System.Net;
 using Nwc.XmlRpc;
-using OpenSim.Framework.Data;
+using OpenSim.Framework.Types;
 using OpenSim.Framework.UserManagement;
 using OpenSim.Framework.Utilities;
 using libsecondlife;