6 files changed, 44 insertions, 46 deletions

diff --git a/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs b/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs
index 8006119..76c4899 100644
--- a/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs
+++ b/OpenSim/Grid/MessagingServer.Modules/UserDataBaseService.cs
@@ -70,6 +70,6 @@ namespace OpenSim.Grid.MessagingServer.Modules
         {
             //throw new Exception("The method or operation is not implemented.");
             return null;
-        }     
+        }
     }
 }
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs
index 9d31d81..77caf47 100644
--- a/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserLoginAuthService.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Grid.UserServer.Modules
 
     /// <summary>
     /// Hypergrid login service used in grid mode.
-    /// </summary>     
+    /// </summary>
     public class UserLoginAuthService : HGLoginAuthService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
diff --git a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
index 01d5537..7d0e0de 100644
--- a/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserLoginService.cs
@@ -34,6 +34,7 @@ using System.Text.RegularExpressions;
 using log4net;
 using Nwc.XmlRpc;
 using OpenMetaverse;
+using Nini.Config;
 using OpenSim.Data;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
@@ -42,6 +43,9 @@ using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Capabilities;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.Connectors;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Grid.UserServer.Modules
 {
@@ -51,7 +55,7 @@ namespace OpenSim.Grid.UserServer.Modules
 
     /// <summary>
     /// Login service used in grid mode.
-    /// </summary>     
+    /// </summary>
     public class UserLoginService : LoginService
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -63,6 +67,8 @@ namespace OpenSim.Grid.UserServer.Modules
         public UserConfig m_config;
         private readonly IRegionProfileRouter m_regionProfileService;
 
+        private IGridService m_GridService;
+
         protected BaseHttpServer m_httpServer;
 
         public UserLoginService(
@@ -76,6 +82,8 @@ namespace OpenSim.Grid.UserServer.Modules
             m_defaultHomeY = m_config.DefaultY;
             m_interInventoryService = inventoryService;
             m_regionProfileService = regionProfileService;
+
+            m_GridService = new GridServicesConnector(config.GridServerURL.ToString());
         }
 
         public void RegisterHandlers(BaseHttpServer httpServer, bool registerLLSDHandler, bool registerOpenIDHandlers)
@@ -203,47 +211,38 @@ namespace OpenSim.Grid.UserServer.Modules
 
         protected override RegionInfo RequestClosestRegion(string region)
         {
-            RegionProfileData profileData = m_regionProfileService.RequestSimProfileData(region,
-                                                                                         m_config.GridServerURL, m_config.GridSendKey, m_config.GridRecvKey);
-
-            if (profileData != null)
-            {
-                return profileData.ToRegionInfo();
-            }
-            else
-            {
-                return null;
-            }
+            return GridRegionToRegionInfo(m_GridService.GetRegionByName(UUID.Zero, region));
         }
 
         protected override RegionInfo GetRegionInfo(ulong homeRegionHandle)
         {
-            RegionProfileData profileData = m_regionProfileService.RequestSimProfileData(homeRegionHandle,
-                                                                                         m_config.GridServerURL, m_config.GridSendKey,
-                                                                                         m_config.GridRecvKey);
-            if (profileData != null)
-            {
-                return profileData.ToRegionInfo();
-            }
-            else
-            {
-                return null;
-            }
+            uint x = 0, y = 0;
+            Utils.LongToUInts(homeRegionHandle, out x, out y);
+            return GridRegionToRegionInfo(m_GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y));
         }
 
         protected override RegionInfo GetRegionInfo(UUID homeRegionId)
         {
-            RegionProfileData profileData = m_regionProfileService.RequestSimProfileData(homeRegionId,
-                                                                                         m_config.GridServerURL, m_config.GridSendKey,
-                                                                                         m_config.GridRecvKey);
-            if (profileData != null)
-            {
-                return profileData.ToRegionInfo();
-            }
-            else
-            {
+            return GridRegionToRegionInfo(m_GridService.GetRegionByUUID(UUID.Zero, homeRegionId));
+        }
+
+        private RegionInfo GridRegionToRegionInfo(GridRegion gregion)
+        {
+            if (gregion == null)
                 return null;
-            }
+
+            RegionInfo rinfo = new RegionInfo();
+            rinfo.ExternalHostName = gregion.ExternalHostName;
+            rinfo.HttpPort = gregion.HttpPort;
+            rinfo.InternalEndPoint = gregion.InternalEndPoint;
+            rinfo.RegionID = gregion.RegionID;
+            rinfo.RegionLocX = (uint)(gregion.RegionLocX / Constants.RegionSize);
+            rinfo.RegionLocY = (uint)(gregion.RegionLocY / Constants.RegionSize);
+            rinfo.RegionName = gregion.RegionName;
+            rinfo.ScopeID = gregion.ScopeID;
+            rinfo.ServerURI = gregion.ServerURI;
+
+            return rinfo;
         }
 
         protected override bool PrepareLoginToRegion(RegionInfo regionInfo, UserProfileData user, LoginResponse response, IPEndPoint remoteClient)
@@ -280,9 +279,8 @@ namespace OpenSim.Grid.UserServer.Modules
                 //response.SeedCapability = serverURI + CapsUtil.GetCapsSeedPath(capsPath);
 
                 // Take off trailing / so that the caps path isn't //CAPS/someUUID
-                if (regionInfo.httpServerURI.EndsWith("/"))
-                    regionInfo.httpServerURI = regionInfo.httpServerURI.Substring(0, regionInfo.httpServerURI.Length - 1);
-                response.SeedCapability = regionInfo.httpServerURI + CapsUtil.GetCapsSeedPath(capsPath);
+                string uri = regionInfo.httpServerURI.Trim(new char[] { '/' });
+                response.SeedCapability = uri + CapsUtil.GetCapsSeedPath(capsPath);
 
 
                 // Notify the target of an incoming user
diff --git a/OpenSim/Grid/UserServer.Modules/UserManager.cs b/OpenSim/Grid/UserServer.Modules/UserManager.cs
index efbf45e..36c6297 100644
--- a/OpenSim/Grid/UserServer.Modules/UserManager.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserManager.cs
@@ -229,7 +229,7 @@ namespace OpenSim.Grid.UserServer.Modules
 
             UserProfileData userProfile = m_userDataBaseService.GetUserProfile(userUuid);
             if (null == userProfile)
-                return Util.CreateUnknownUserErrorResponse();            
+                return Util.CreateUnknownUserErrorResponse();
 
             string authed;
             
@@ -249,12 +249,12 @@ namespace OpenSim.Grid.UserServer.Modules
 //                "[USER MANAGER]: Authentication by password result from {0} for {1} is {2}",
 //                remoteClient, userUuid, authed);
 
-            XmlRpcResponse response = new XmlRpcResponse();            
-            Hashtable responseData = new Hashtable();            
+            XmlRpcResponse response = new XmlRpcResponse();
+            Hashtable responseData = new Hashtable();
             responseData["auth_user"] = authed;
             response.Value = responseData;
             
-            return response;            
+            return response;
         }
 
         public XmlRpcResponse XmlRPCGetAvatarPickerAvatar(XmlRpcRequest request, IPEndPoint remoteClient)
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index a92226d..286076d7 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -187,13 +187,13 @@ namespace OpenSim.Grid.UserServer
         /// <param name="inventoryService"></param>
         protected virtual void StartupUserServerModules()
         {
-            m_log.Info("[STARTUP]: Establishing data connection");                        
+            m_log.Info("[STARTUP]: Establishing data connection");
             
             //we only need core components so we can request them from here
             IInterServiceInventoryServices inventoryService;
             TryGet<IInterServiceInventoryServices>(out inventoryService);
             
-            CommunicationsManager commsManager = new UserServerCommsManager(inventoryService);            
+            CommunicationsManager commsManager = new UserServerCommsManager(inventoryService);
 
             //setup database access service, for now this has to be created before the other modules.
             m_userDataBaseService = new UserDataBaseService(commsManager);
diff --git a/OpenSim/Grid/UserServer/UserServerCommsManager.cs b/OpenSim/Grid/UserServer/UserServerCommsManager.cs
index 7200836..8ef693b 100644
--- a/OpenSim/Grid/UserServer/UserServerCommsManager.cs
+++ b/OpenSim/Grid/UserServer/UserServerCommsManager.cs
@@ -28,9 +28,9 @@
 using OpenSim.Framework.Communications;
 
 namespace OpenSim.Grid.UserServer
-{        
+{
     public class UserServerCommsManager : CommunicationsManager
-    {        
+    {
         public UserServerCommsManager(IInterServiceInventoryServices interServiceInventoryService)
             : base(null, null)
         {