Attempt to fix the issue where, when logging into the grid, the user supplies a region name, but instead of going to the specific region, they are sent to a region "Like" the one specified.

Signed-off-by: Terry <terry@digiworldz.com>
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>

10 files changed, 83 insertions, 3 deletions

diff --git a/OpenSim/Data/IRegionData.cs b/OpenSim/Data/IRegionData.cs
index c8e38a4..d67b5fa 100644
--- a/OpenSim/Data/IRegionData.cs
+++ b/OpenSim/Data/IRegionData.cs
@@ -71,6 +71,10 @@ namespace OpenSim.Data
     {
         RegionData Get(UUID regionID, UUID ScopeID);
         List<RegionData> Get(string regionName, UUID ScopeID);
+
+        //BA MOD....
+        RegionData GetSpecific(string regionName, UUID ScopeID);
+
         RegionData Get(int x, int y, UUID ScopeID);
         List<RegionData> Get(int xStart, int yStart, int xEnd, int yEnd, UUID ScopeID);
 
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 46df421..12064a3 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -81,7 +81,30 @@ namespace OpenSim.Data.MySQL
             }
         }
 
-        public RegionData Get(int posX, int posY, UUID scopeID)
+        //BA MOD....
+        public RegionData GetSpecific(string regionName, UUID scopeID)
+        {
+            string command = "select * from `" + m_Realm + "` where regionName = ?regionName";
+            if (scopeID != UUID.Zero)
+                command += " and ScopeID = ?scopeID";
+
+            //command += " order by regionName";
+
+            using (MySqlCommand cmd = new MySqlCommand(command))
+            {
+                cmd.Parameters.AddWithValue("?regionName", regionName);
+                cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
+
+                List<RegionData> ret = RunCommand(cmd);
+                if (ret.Count == 0)
+                    return null;
+
+                return ret[0];
+            }
+
+        }
+
+            public RegionData Get(int posX, int posY, UUID scopeID)
         {
 /* fixed size regions
             string command = "select * from `"+m_Realm+"` where locX = ?posX and locY = ?posY";
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs
index 595db2f..a4385fe 100644
--- a/OpenSim/Data/Null/NullRegionData.cs
+++ b/OpenSim/Data/Null/NullRegionData.cs
@@ -166,7 +166,13 @@ namespace OpenSim.Data.Null
             return null;
         }
 
-        public List<RegionData> Get(int startX, int startY, int endX, int endY, UUID scopeID)
+        //BA MOD...
+        public RegionData GetSpecific(string regionName, UUID ScopeID)
+        {
+            return null;
+        }
+
+            public List<RegionData> Get(int startX, int startY, int endX, int endY, UUID scopeID)
         {
             if (m_useStaticInstance && Instance != this)
                 return Instance.Get(startX, startY, endX, endY, scopeID);
diff --git a/OpenSim/Data/PGSQL/PGSQLRegionData.cs b/OpenSim/Data/PGSQL/PGSQLRegionData.cs
index 1272e37..a5d2266 100644
--- a/OpenSim/Data/PGSQL/PGSQLRegionData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLRegionData.cs
@@ -114,6 +114,12 @@ namespace OpenSim.Data.PGSQL
             }
         }
 
+        //BA MOD...
+        public RegionData GetSpecific(string regionName, UUID ScopeID)
+        {
+            return null;
+        }
+
         public RegionData Get(int posX, int posY, UUID scopeID)
         {
             // extend database search for maximum region size area
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index d220568..4afd0ac 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -240,6 +240,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             return rinfo;
         }
 
+        public GridRegion GetRegionByNameSpecific(UUID scopeID, string regionName)
+        {
+
+            return null;
+        }
+
         public GridRegion GetRegionByName(UUID scopeID, string regionName)
         {
             bool inCache = false;
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
index d31c7ad..5359e28 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
@@ -236,6 +236,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             return rinfo;
         }
 
+        public GridRegion GetRegionByNameSpecific(UUID scopeID, string regionName)
+        {
+
+            return null;
+        }
+
         public GridRegion GetRegionByName(UUID scopeID, string name)
         {
             GridRegion rinfo = m_LocalGridService.GetRegionByName(scopeID, name);
diff --git a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
index ded7806..e863718 100644
--- a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
@@ -330,6 +330,12 @@ namespace OpenSim.Services.Connectors
             return rinfo;
         }
 
+        public GridRegion GetRegionByNameSpecific(UUID scopeID, string regionName)
+        {
+
+            return null;
+        }
+
         public GridRegion GetRegionByName(UUID scopeID, string regionName)
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index f8eebbe..04de4d7 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -100,6 +100,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         #region IGridService
 
+
+
         public string RegisterRegion(UUID scopeID, GridRegion regionInfo)
         {
             IPEndPoint ext = regionInfo.ExternalEndPoint;
@@ -245,6 +247,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
             }
         }
 
+        public GridRegion GetRegionByNameSpecific(UUID scopeID, string regionName)
+        {
+
+            return null;
+        }
+
         public GridRegion GetRegionByName(UUID scopeID, string regionName)
         {
             List<GridRegion> regions = GetRegionsByName(scopeID, regionName, 1);
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 40893a9..b672e8c 100755
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -490,7 +490,18 @@ namespace OpenSim.Services.GridService
             return null;
         }
 
-        public List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber)
+        //BA MOD....
+        public GridRegion GetRegionByNameSpecific(UUID scopeID, string name)
+        {
+            RegionData rdata = m_Database.GetSpecific(name, scopeID);
+            if (rdata != null)
+            {
+                return RegionData2RegionInfo(rdata);
+            }
+            return null;
+        }
+
+            public List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber)
         {
 //            m_log.DebugFormat("[GRID SERVICE]: GetRegionsByName {0}", name);
 
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index ead5d3c..f832d1d 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -84,6 +84,10 @@ namespace OpenSim.Services.Interfaces
         /// <returns>Returns the region information if the name matched.  Null otherwise.</returns>
         GridRegion GetRegionByName(UUID scopeID, string regionName);
 
+
+        //BA MOD.....
+        GridRegion GetRegionByNameSpecific(UUID scopeID, string regionName);
+
         /// <summary>
         /// Get information about regions starting with the provided name.
         /// </summary>