aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTerry2019-11-12 11:02:10 -0500
committerUbitUmarov2019-11-14 05:26:54 +0000
commit2f79f463ea07369f6ec154c67b25705cf1a2a616 (patch)
treeda64db8ae91f5dc6364dfb0f3c2cd1a026432cc2 /OpenSim/Region
parentmantis 8627: handle the case constant compareOp constant on Yengine (diff)
downloadopensim-SC-2f79f463ea07369f6ec154c67b25705cf1a2a616.zip
opensim-SC-2f79f463ea07369f6ec154c67b25705cf1a2a616.tar.gz
opensim-SC-2f79f463ea07369f6ec154c67b25705cf1a2a616.tar.bz2
opensim-SC-2f79f463ea07369f6ec154c67b25705cf1a2a616.tar.xz
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>
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs6
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs6
2 files changed, 12 insertions, 0 deletions
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
240 return rinfo; 240 return rinfo;
241 } 241 }
242 242
243 public GridRegion GetRegionByNameSpecific(UUID scopeID, string regionName)
244 {
245
246 return null;
247 }
248
243 public GridRegion GetRegionByName(UUID scopeID, string regionName) 249 public GridRegion GetRegionByName(UUID scopeID, string regionName)
244 { 250 {
245 bool inCache = false; 251 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
236 return rinfo; 236 return rinfo;
237 } 237 }
238 238
239 public GridRegion GetRegionByNameSpecific(UUID scopeID, string regionName)
240 {
241
242 return null;
243 }
244
239 public GridRegion GetRegionByName(UUID scopeID, string name) 245 public GridRegion GetRegionByName(UUID scopeID, string name)
240 { 246 {
241 GridRegion rinfo = m_LocalGridService.GetRegionByName(scopeID, name); 247 GridRegion rinfo = m_LocalGridService.GetRegionByName(scopeID, name);