diff options
| author | Melanie | 2011-11-28 11:06:38 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-28 11:06:38 +0000 |
| commit | dc612d0f08ff8740c1942270f22eb79f0310c8fd (patch) | |
| tree | 4c621d499eecbc176c6eb28a4bad4f8f4872e7f5 /OpenSim/Region/CoreModules | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-dc612d0f08ff8740c1942270f22eb79f0310c8fd.zip opensim-SC_OLD-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.gz opensim-SC_OLD-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.bz2 opensim-SC_OLD-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs index c13e9c6..44475a5 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | |||
| @@ -92,7 +92,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
| 92 | return; | 92 | return; |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | m_log.DebugFormat("MAP NAME=({0})", mapName); | 95 | //m_log.DebugFormat("MAP NAME=({0})", mapName); |
| 96 | 96 | ||
| 97 | // try to fetch from GridServer | 97 | // try to fetch from GridServer |
| 98 | List<GridRegion> regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20); | 98 | List<GridRegion> regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20); |