diff options
author | UbitUmarov | 2016-07-28 00:34:16 +0100 |
---|---|---|
committer | UbitUmarov | 2016-07-28 00:34:16 +0100 |
commit | ec8101a24ad8181c12525421024616fc509b60da (patch) | |
tree | 04d12c9203ce76a00a17efa34447d8a5bf821340 /OpenSim/Region/CoreModules/World | |
parent | remove the RegionCombinerModule (mega regions), references still all over the... (diff) | |
download | opensim-SC_OLD-ec8101a24ad8181c12525421024616fc509b60da.zip opensim-SC_OLD-ec8101a24ad8181c12525421024616fc509b60da.tar.gz opensim-SC_OLD-ec8101a24ad8181c12525421024616fc509b60da.tar.bz2 opensim-SC_OLD-ec8101a24ad8181c12525421024616fc509b60da.tar.xz |
remove references to RegionCombinerModule
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs | 14 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs index cb2c7f1..6c8f37b 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs | |||
@@ -522,22 +522,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
522 | 522 | ||
523 | protected static void WriteRegionInfo(Scene scene, XmlTextWriter xtw) | 523 | protected static void WriteRegionInfo(Scene scene, XmlTextWriter xtw) |
524 | { | 524 | { |
525 | bool isMegaregion; | ||
526 | Vector2 size; | 525 | Vector2 size; |
527 | 526 | ||
528 | IRegionCombinerModule rcMod = scene.RequestModuleInterface<IRegionCombinerModule>(); | 527 | size = new Vector2((float)scene.RegionInfo.RegionSizeX, (float)scene.RegionInfo.RegionSizeY); |
529 | |||
530 | if (rcMod != null) | ||
531 | isMegaregion = rcMod.IsRootForMegaregion(scene.RegionInfo.RegionID); | ||
532 | else | ||
533 | isMegaregion = false; | ||
534 | |||
535 | if (isMegaregion) | ||
536 | size = rcMod.GetSizeOfMegaregion(scene.RegionInfo.RegionID); | ||
537 | else | ||
538 | size = new Vector2((float)scene.RegionInfo.RegionSizeX, (float)scene.RegionInfo.RegionSizeY); | ||
539 | 528 | ||
540 | xtw.WriteElementString("is_megaregion", isMegaregion.ToString()); | ||
541 | xtw.WriteElementString("size_in_meters", string.Format("{0},{1}", size.X, size.Y)); | 529 | xtw.WriteElementString("size_in_meters", string.Format("{0},{1}", size.X, size.Y)); |
542 | } | 530 | } |
543 | 531 | ||
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs index ca94f42..150d4ec 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |||
@@ -53,7 +53,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
53 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 53 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
54 | 54 | ||
55 | public Scene Scene { get; private set; } | 55 | public Scene Scene { get; private set; } |
56 | public IRegionCombinerModule RegionCombinerModule { get; private set; } | ||
57 | 56 | ||
58 | /// <value> | 57 | /// <value> |
59 | /// The file used to load and save an opensimulator archive if no filename has been specified | 58 | /// The file used to load and save an opensimulator archive if no filename has been specified |
@@ -85,7 +84,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
85 | 84 | ||
86 | public void RegionLoaded(Scene scene) | 85 | public void RegionLoaded(Scene scene) |
87 | { | 86 | { |
88 | RegionCombinerModule = scene.RequestModuleInterface<IRegionCombinerModule>(); | ||
89 | } | 87 | } |
90 | 88 | ||
91 | public void RemoveRegion(Scene scene) | 89 | public void RemoveRegion(Scene scene) |