diff options
| author | UbitUmarov | 2016-11-30 10:08:49 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-11-30 10:08:49 +0000 |
| commit | adee1c1bb0b0b452f3774bdabc5dc0b133407b6a (patch) | |
| tree | 8e1886b8930bb87ee242d89d649b561643dda67b /OpenSim | |
| parent | fix null ref on m_CacheCleanTimer control, add a gc.collect on manual floats... (diff) | |
| download | opensim-SC_OLD-adee1c1bb0b0b452f3774bdabc5dc0b133407b6a.zip opensim-SC_OLD-adee1c1bb0b0b452f3774bdabc5dc0b133407b6a.tar.gz opensim-SC_OLD-adee1c1bb0b0b452f3774bdabc5dc0b133407b6a.tar.bz2 opensim-SC_OLD-adee1c1bb0b0b452f3774bdabc5dc0b133407b6a.tar.xz | |
fix a null ref
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs index b1234fe..d1fe3c7 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | |||
| @@ -188,7 +188,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
| 188 | //m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count); | 188 | //m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count); |
| 189 | 189 | ||
| 190 | MapBlockData data; | 190 | MapBlockData data; |
| 191 | if (regionInfos.Count > 0) | 191 | if (regionInfos != null && regionInfos.Count > 0) |
| 192 | { | 192 | { |
| 193 | foreach (GridRegion info in regionInfos) | 193 | foreach (GridRegion info in regionInfos) |
| 194 | { | 194 | { |
| @@ -205,7 +205,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
| 205 | } | 205 | } |
| 206 | 206 | ||
| 207 | // final block, closing the search result | 207 | // final block, closing the search result |
| 208 | AddFinalBlock(blocks,mapNameOrig); | 208 | AddFinalBlock(blocks,mapNameOrig); |
| 209 | 209 | ||
| 210 | // flags are agent flags sent from the viewer. | 210 | // flags are agent flags sent from the viewer. |
| 211 | // they have different values depending on different viewers, apparently | 211 | // they have different values depending on different viewers, apparently |