From 35a245b67a44eaa62dbf7951646ad9818caa8b02 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 31 Jan 2010 22:35:23 -0800 Subject: Assorted bug fixes related to hyperlinking --- .../ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs') 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 return rinfo; } - // Let's not override GetRegionsByName -- let's get them all from the grid server + public override List GetRegionsByName(UUID scopeID, string name, int maxNumber) + { + List rinfo = m_LocalGridService.GetRegionsByName(scopeID, name, maxNumber); + List grinfo = base.GetRegionsByName(scopeID, name, maxNumber); + + if (grinfo != null) + rinfo.AddRange(grinfo); + return rinfo; + } + // Let's not override GetRegionRange -- let's get them all from the grid server #endregion -- cgit v1.1