Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
commit
603e3650d3
|
@ -322,10 +322,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
|
|||
{
|
||||
List<GridRegion> rinfos = new List<GridRegion>();
|
||||
|
||||
// Commenting until regionname exists
|
||||
//foreach (SimpleRegionInfo r in m_HyperlinkRegions.Values)
|
||||
// if ((r.RegionName != null) && r.RegionName.StartsWith(name))
|
||||
// rinfos.Add(r);
|
||||
if (name == string.Empty)
|
||||
return rinfos;
|
||||
|
||||
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));
|
||||
return rinfos;
|
||||
|
|
|
@ -148,7 +148,7 @@
|
|||
MaximumTimeBeforePersistenceConsidered = 600
|
||||
|
||||
; 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
|
||||
|
|
Loading…
Reference in New Issue