diff options
author | Melanie | 2011-11-19 22:26:41 +0100 |
---|---|---|
committer | Melanie | 2011-11-19 22:26:41 +0100 |
commit | dec8b9c98dae977d6d9a94cc21d296f10957cf44 (patch) | |
tree | 27c5a94ae30b1acb7d0f0cd120f6060fb1ef5be2 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge (diff) | |
parent | Merge branch 'master' into bigmerge (diff) | |
download | opensim-SC-dec8b9c98dae977d6d9a94cc21d296f10957cf44.zip opensim-SC-dec8b9c98dae977d6d9a94cc21d296f10957cf44.tar.gz opensim-SC-dec8b9c98dae977d6d9a94cc21d296f10957cf44.tar.bz2 opensim-SC-dec8b9c98dae977d6d9a94cc21d296f10957cf44.tar.xz |
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-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 b6067ea..66341a1 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -5222,18 +5222,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
5222 | return offsets.ToArray(); | 5222 | return offsets.ToArray(); |
5223 | } | 5223 | } |
5224 | 5224 | ||
5225 | /// <summary> | ||
5226 | /// Regenerate the maptile for this scene. | ||
5227 | /// </summary> | ||
5228 | /// <param name="sender"></param> | ||
5229 | /// <param name="e"></param> | ||
5225 | public void RegenerateMaptile(object sender, ElapsedEventArgs e) | 5230 | public void RegenerateMaptile(object sender, ElapsedEventArgs e) |
5226 | { | 5231 | { |
5227 | IWorldMapModule mapModule = RequestModuleInterface<IWorldMapModule>(); | 5232 | IWorldMapModule mapModule = RequestModuleInterface<IWorldMapModule>(); |
5228 | if (mapModule != null) | 5233 | if (mapModule != null) |
5229 | { | ||
5230 | mapModule.GenerateMaptile(); | 5234 | mapModule.GenerateMaptile(); |
5231 | |||
5232 | string error = GridService.RegisterRegion(RegionInfo.ScopeID, new GridRegion(RegionInfo)); | ||
5233 | |||
5234 | if (error != String.Empty) | ||
5235 | throw new Exception(error); | ||
5236 | } | ||
5237 | } | 5235 | } |
5238 | 5236 | ||
5239 | // public void CleanDroppedAttachments() | 5237 | // public void CleanDroppedAttachments() |