aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-28 00:30:46 -0700
committerJohn Hurliman2009-10-28 00:30:46 -0700
commit603e3650d3fac9705770484afcfcdce06f3d8ae5 (patch)
tree9fb08e4bcb2b115d8eaa61e1f3a0a6bc75a3cecb
parentUpdating the OpenJPEG libraries to the versions from libomv 0.8.0 (diff)
parentChanged True to true in OpenSim.ini.example. (diff)
downloadopensim-SC_OLD-603e3650d3fac9705770484afcfcdce06f3d8ae5.zip
opensim-SC_OLD-603e3650d3fac9705770484afcfcdce06f3d8ae5.tar.gz
opensim-SC_OLD-603e3650d3fac9705770484afcfcdce06f3d8ae5.tar.bz2
opensim-SC_OLD-603e3650d3fac9705770484afcfcdce06f3d8ae5.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs10
-rw-r--r--bin/OpenSim.ini.example2
2 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
index 046bee5..40ac647 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
@@ -322,10 +322,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
322 { 322 {
323 List<GridRegion> rinfos = new List<GridRegion>(); 323 List<GridRegion> rinfos = new List<GridRegion>();
324 324
325 // Commenting until regionname exists 325 if (name == string.Empty)
326 //foreach (SimpleRegionInfo r in m_HyperlinkRegions.Values) 326 return rinfos;
327 // if ((r.RegionName != null) && r.RegionName.StartsWith(name)) 327
328 // rinfos.Add(r); 328 foreach (GridRegion r in m_HyperlinkRegions.Values)
329 if ((r.RegionName != null) && r.RegionName.ToLower().StartsWith(name.ToLower()))
330 rinfos.Add(r);
329 331
330 rinfos.AddRange(m_GridServiceConnector.GetRegionsByName(scopeID, name, maxNumber)); 332 rinfos.AddRange(m_GridServiceConnector.GetRegionsByName(scopeID, name, maxNumber));
331 return rinfos; 333 return rinfos;
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 927eb7a..43e6c85 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -148,7 +148,7 @@
148 MaximumTimeBeforePersistenceConsidered = 600 148 MaximumTimeBeforePersistenceConsidered = 600
149 149
150 ; Should avatars in neighbor sims see objects in this sim? 150 ; Should avatars in neighbor sims see objects in this sim?
151 see_into_this_sim_from_neighbor = True 151 see_into_this_sim_from_neighbor = true
152 152
153 ; ## 153 ; ##
154 ; ## PHYSICS 154 ; ## PHYSICS