aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDiva Canto2010-01-31 22:35:23 -0800
committerDiva Canto2010-01-31 22:35:23 -0800
commit35a245b67a44eaa62dbf7951646ad9818caa8b02 (patch)
tree1b839dca4d1c391539ea67ffc7bdf7a9653d5cbe /OpenSim/Region
parent* Remove unnecessary debug message (diff)
downloadopensim-SC_OLD-35a245b67a44eaa62dbf7951646ad9818caa8b02.zip
opensim-SC_OLD-35a245b67a44eaa62dbf7951646ad9818caa8b02.tar.gz
opensim-SC_OLD-35a245b67a44eaa62dbf7951646ad9818caa8b02.tar.bz2
opensim-SC_OLD-35a245b67a44eaa62dbf7951646ad9818caa8b02.tar.xz
Assorted bug fixes related to hyperlinking
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
index 391e7c8..61a8fff 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
@@ -188,7 +188,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
188 return rinfo; 188 return rinfo;
189 } 189 }
190 190
191 // Let's not override GetRegionsByName -- let's get them all from the grid server 191 public override List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber)
192 {
193 List<GridRegion> rinfo = m_LocalGridService.GetRegionsByName(scopeID, name, maxNumber);
194 List<GridRegion> grinfo = base.GetRegionsByName(scopeID, name, maxNumber);
195
196 if (grinfo != null)
197 rinfo.AddRange(grinfo);
198 return rinfo;
199 }
200
192 // Let's not override GetRegionRange -- let's get them all from the grid server 201 // Let's not override GetRegionRange -- let's get them all from the grid server
193 202
194 #endregion 203 #endregion