aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2015-08-23 01:42:51 +0100
committerUbitUmarov2015-08-23 01:42:51 +0100
commit24a093035b5dba3754ec92128a18a9ae5a01b243 (patch)
tree05fe7ddf3049776f7c2b3cf8fc2f9c0a2f908310 /OpenSim/Region
parent fix mySQL ( ignoring other dbs ) (diff)
downloadopensim-SC_OLD-24a093035b5dba3754ec92128a18a9ae5a01b243.zip
opensim-SC_OLD-24a093035b5dba3754ec92128a18a9ae5a01b243.tar.gz
opensim-SC_OLD-24a093035b5dba3754ec92128a18a9ae5a01b243.tar.bz2
opensim-SC_OLD-24a093035b5dba3754ec92128a18a9ae5a01b243.tar.xz
more fixes on map
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs5
-rw-r--r--OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs10
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs2
3 files changed, 11 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
index 8484809..3ed756a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
@@ -144,9 +144,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
144 lock (m_scenes) 144 lock (m_scenes)
145 m_scenes[scene.RegionInfo.RegionID] = scene; 145 m_scenes[scene.RegionInfo.RegionID] = scene;
146 146
147 // v2 Map generation on startup is now handled by scene to allow bmp to be shared with
148 // v1 service and not generate map tiles twice as was previous behavior
149 //scene.EventManager.OnRegionReadyStatusChange += s => { if (s.Ready) UploadMapTile(s); };
147 scene.RegisterModuleInterface<IMapTileModule>(this); 150 scene.RegisterModuleInterface<IMapTileModule>(this);
148
149 scene.EventManager.OnRegionReadyStatusChange += s => { if (s.Ready) UploadMapTile(s); };
150 } 151 }
151 152
152 ///<summary> 153 ///<summary>
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
index 17066bd..f538c9e 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
@@ -125,10 +125,12 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
125 125
126 public Bitmap CreateMapTile() 126 public Bitmap CreateMapTile()
127 { 127 {
128 /* this must be on all map, not just its image
128 if ((DateTime.Now - lastImageTime).TotalSeconds < 3600) 129 if ((DateTime.Now - lastImageTime).TotalSeconds < 3600)
129 { 130 {
130 return lastImage.Clone(new Rectangle(0, 0, 256, 256), lastImage.PixelFormat); 131 return (Bitmap)lastImage.Clone();
131 } 132 }
133 */
132 134
133 List<string> renderers = RenderingLoader.ListRenderers(Util.ExecutingDirectory()); 135 List<string> renderers = RenderingLoader.ListRenderers(Util.ExecutingDirectory());
134 if (renderers.Count > 0) 136 if (renderers.Count > 0)
@@ -147,10 +149,12 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
147 149
148 Bitmap tile = CreateMapTile(viewport, false); 150 Bitmap tile = CreateMapTile(viewport, false);
149 m_primMesher = null; 151 m_primMesher = null;
150 152 return tile;
153/*
151 lastImage = tile; 154 lastImage = tile;
152 lastImageTime = DateTime.Now; 155 lastImageTime = DateTime.Now;
153 return lastImage.Clone(new Rectangle(0, 0, 256, 256), lastImage.PixelFormat); 156 return (Bitmap)lastImage.Clone();
157 */
154 } 158 }
155 159
156 public Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height, bool useTextures) 160 public Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height, bool useTextures)
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 9a6ee99..1ebde68 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -1408,7 +1408,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
1408 using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTile()) 1408 using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTile())
1409 { 1409 {
1410 GenerateMaptile(mapbmp); 1410 GenerateMaptile(mapbmp);
1411// m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp); 1411 m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
1412 } 1412 }
1413 } 1413 }
1414 1414