diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/WorldMap')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | 12 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs index 657975b..f9384e9 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | |||
@@ -86,9 +86,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
86 | 86 | ||
87 | private void OnMapNameRequest(IClientAPI remoteClient, string mapName, uint flags) | 87 | private void OnMapNameRequest(IClientAPI remoteClient, string mapName, uint flags) |
88 | { | 88 | { |
89 | if (mapName.Length < 3) | 89 | if (mapName.Length < 2) |
90 | { | 90 | { |
91 | remoteClient.SendAlertMessage("Use a search string with at least 3 characters"); | 91 | remoteClient.SendAlertMessage("Use a search string with at least 2 characters"); |
92 | return; | 92 | return; |
93 | } | 93 | } |
94 | 94 | ||
@@ -96,10 +96,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
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); |
99 | if (regionInfos.Count == 0) | 99 | // if (regionInfos.Count == 0) |
100 | remoteClient.SendAlertMessage("Hyperlink could not be established."); | 100 | // remoteClient.SendAlertMessage("Hyperlink could not be established."); |
101 | 101 | ||
102 | m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions. Flags={2}", mapName, regionInfos.Count, flags); | 102 | //m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count); |
103 | List<MapBlockData> blocks = new List<MapBlockData>(); | 103 | List<MapBlockData> blocks = new List<MapBlockData>(); |
104 | 104 | ||
105 | MapBlockData data; | 105 | MapBlockData data; |
@@ -128,7 +128,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
128 | data.Agents = 0; | 128 | data.Agents = 0; |
129 | data.Access = 255; | 129 | data.Access = 255; |
130 | data.MapImageId = UUID.Zero; | 130 | data.MapImageId = UUID.Zero; |
131 | data.Name = ""; // mapName; | 131 | data.Name = mapName; |
132 | data.RegionFlags = 0; | 132 | data.RegionFlags = 0; |
133 | data.WaterHeight = 0; // not used | 133 | data.WaterHeight = 0; // not used |
134 | data.X = 0; | 134 | data.X = 0; |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index ac95598..37296af 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -1239,7 +1239,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1239 | } | 1239 | } |
1240 | else | 1240 | else |
1241 | { | 1241 | { |
1242 | OSDArray responsearr = new OSDArray(m_scene.GetRootAgentCount()); | 1242 | OSDArray responsearr = new OSDArray(); // Don't preallocate. MT (m_scene.GetRootAgentCount()); |
1243 | m_scene.ForEachRootScenePresence(delegate(ScenePresence sp) | 1243 | m_scene.ForEachRootScenePresence(delegate(ScenePresence sp) |
1244 | { | 1244 | { |
1245 | OSDMap responsemapdata = new OSDMap(); | 1245 | OSDMap responsemapdata = new OSDMap(); |