OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mantis 8583: update region information on Grid on map regeneration

0.9.1.0-post-fixes
UbitUmarov 2019-08-27 21:24:54 +01:00
parent 718c6d1e4d
commit 60fa28740a
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -12163,7 +12163,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
m_lastMapRegenTime = Double.MaxValue; m_lastMapRegenTime = Double.MaxValue;
mapModule.GenerateMaptile(); ((Scene)Scene).RegenerateMaptileAndReregister(this, null);
SendAlertMessage("Terrain map generated"); SendAlertMessage("Terrain map generated");
m_lastMapRegenTime = now; m_lastMapRegenTime = now;
} }

2
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
View File

@ -1545,7 +1545,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
if (consoleScene != null && consoleScene != m_scene) if (consoleScene != null && consoleScene != m_scene)
return; return;
GenerateMaptile(); m_scene.RegenerateMaptileAndReregister(this, null);
} }
public OSD HandleRemoteMapItemRequest(string path, OSD request, string endpoint) public OSD HandleRemoteMapItemRequest(string path, OSD request, string endpoint)

6
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -1040,7 +1040,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
m_mapGenerationTimer.Interval = maptileRefresh * 1000; m_mapGenerationTimer.Interval = maptileRefresh * 1000;
m_mapGenerationTimer.Elapsed += RegenerateMaptileAndReregister; m_mapGenerationTimer.Elapsed += RegenerateMaptileAndReregister;
m_mapGenerationTimer.AutoReset = true; m_mapGenerationTimer.AutoReset = false;
m_mapGenerationTimer.Start(); m_mapGenerationTimer.Start();
} }
} }
@ -6026,7 +6026,9 @@ Environment.Exit(1);
// so that all simulators can retrieve it // so that all simulators can retrieve it
string error = GridService.RegisterRegion(RegionInfo.ScopeID, new GridRegion(RegionInfo)); string error = GridService.RegisterRegion(RegionInfo.ScopeID, new GridRegion(RegionInfo));
if (error != string.Empty) if (error != string.Empty)
throw new Exception(error); throw new Exception(error);
if(m_generateMaptiles)
m_mapGenerationTimer.Start();
} }
/// <summary> /// <summary>