diff options
author | UbitUmarov | 2015-09-03 18:39:08 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-03 18:39:08 +0100 |
commit | cdaed113872f0615a0d2864cc54064a4432054c6 (patch) | |
tree | 246e62dfeffac632cdcd9738a77faebd30b3bd6c /OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |
parent | seems to compile ( tests comented out) (diff) | |
download | opensim-SC_OLD-cdaed113872f0615a0d2864cc54064a4432054c6.zip opensim-SC_OLD-cdaed113872f0615a0d2864cc54064a4432054c6.tar.gz opensim-SC_OLD-cdaed113872f0615a0d2864cc54064a4432054c6.tar.bz2 opensim-SC_OLD-cdaed113872f0615a0d2864cc54064a4432054c6.tar.xz |
at last we can login and see objects ( friends is dead and disable in
scenepresence)
Diffstat (limited to 'OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index b6d96ac..adcad03 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -1426,7 +1426,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1426 | using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTile()) | 1426 | using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTile()) |
1427 | { | 1427 | { |
1428 | GenerateMaptile(mapbmp); | 1428 | GenerateMaptile(mapbmp); |
1429 | m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp); | 1429 | if(m_mapImageServiceModule != null) |
1430 | m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp); | ||
1430 | } | 1431 | } |
1431 | } | 1432 | } |
1432 | 1433 | ||
@@ -1562,7 +1563,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1562 | GenerateMaptile(mapbmp); | 1563 | GenerateMaptile(mapbmp); |
1563 | 1564 | ||
1564 | // v2/3 (MapImageServiceModule) | 1565 | // v2/3 (MapImageServiceModule) |
1565 | m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp); | 1566 | if(m_mapImageServiceModule !=null) |
1567 | m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp); | ||
1566 | } | 1568 | } |
1567 | } | 1569 | } |
1568 | 1570 | ||