diff options
author | Justin Clark-Casey (justincc) | 2011-11-19 00:07:34 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-19 00:07:34 +0000 |
commit | 01ae916bad672722aa62ee712b7b580d6f5f4370 (patch) | |
tree | 82199ee4f473d9639e73a67cc8b2f30aeaeb047b /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Replace HttpServer_OpenSim.dll with Oren Hurvitz's patch applied. (diff) | |
download | opensim-SC_OLD-01ae916bad672722aa62ee712b7b580d6f5f4370.zip opensim-SC_OLD-01ae916bad672722aa62ee712b7b580d6f5f4370.tar.gz opensim-SC_OLD-01ae916bad672722aa62ee712b7b580d6f5f4370.tar.bz2 opensim-SC_OLD-01ae916bad672722aa62ee712b7b580d6f5f4370.tar.xz |
Don't register a region twice on both official registration and maptile regeneration.
Maptile storage appears orthogonal to region registration
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index f10789b..47450ed 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -5017,18 +5017,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
5017 | return offsets.ToArray(); | 5017 | return offsets.ToArray(); |
5018 | } | 5018 | } |
5019 | 5019 | ||
5020 | /// <summary> | ||
5021 | /// Regenerate the maptile for this scene. | ||
5022 | /// </summary> | ||
5023 | /// <param name="sender"></param> | ||
5024 | /// <param name="e"></param> | ||
5020 | public void RegenerateMaptile(object sender, ElapsedEventArgs e) | 5025 | public void RegenerateMaptile(object sender, ElapsedEventArgs e) |
5021 | { | 5026 | { |
5022 | IWorldMapModule mapModule = RequestModuleInterface<IWorldMapModule>(); | 5027 | IWorldMapModule mapModule = RequestModuleInterface<IWorldMapModule>(); |
5023 | if (mapModule != null) | 5028 | if (mapModule != null) |
5024 | { | ||
5025 | mapModule.GenerateMaptile(); | 5029 | mapModule.GenerateMaptile(); |
5026 | |||
5027 | string error = GridService.RegisterRegion(RegionInfo.ScopeID, new GridRegion(RegionInfo)); | ||
5028 | |||
5029 | if (error != String.Empty) | ||
5030 | throw new Exception(error); | ||
5031 | } | ||
5032 | } | 5030 | } |
5033 | 5031 | ||
5034 | // This method is called across the simulation connector to | 5032 | // This method is called across the simulation connector to |