OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

0.6.8-post-fixes
John Hurliman 2009-10-28 00:30:46 -07:00
parent 588c543299 79bf906e7d
commit 603e3650d3
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
View File

@ -322,10 +322,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
{ {
List<GridRegion> rinfos = new List<GridRegion>(); List<GridRegion> rinfos = new List<GridRegion>();
// Commenting until regionname exists if (name == string.Empty)
//foreach (SimpleRegionInfo r in m_HyperlinkRegions.Values) return rinfos;
// if ((r.RegionName != null) && r.RegionName.StartsWith(name))
// rinfos.Add(r); foreach (GridRegion r in m_HyperlinkRegions.Values)
if ((r.RegionName != null) && r.RegionName.ToLower().StartsWith(name.ToLower()))
rinfos.Add(r);
rinfos.AddRange(m_GridServiceConnector.GetRegionsByName(scopeID, name, maxNumber)); rinfos.AddRange(m_GridServiceConnector.GetRegionsByName(scopeID, name, maxNumber));
return rinfos; return rinfos;

2
bin/OpenSim.ini.example
View File

@ -148,7 +148,7 @@
MaximumTimeBeforePersistenceConsidered = 600 MaximumTimeBeforePersistenceConsidered = 600
; Should avatars in neighbor sims see objects in this sim? ; Should avatars in neighbor sims see objects in this sim?
see_into_this_sim_from_neighbor = True see_into_this_sim_from_neighbor = true
; ## ; ##
; ## PHYSICS ; ## PHYSICS