diff options
author | Jak Daniels | 2015-11-26 23:53:40 +0000 |
---|---|---|
committer | UbitUmarov | 2015-11-27 00:16:08 +0000 |
commit | c0e920c1ad130e19e7359b4fd5f230eb865439bf (patch) | |
tree | 6355016957074322d5de899f143635eefe0d7d5c /OpenSim/Region/CoreModules/World | |
parent | Mantis #7765: Add new ClampNegativeZ option. Defaults to false to restore pri... (diff) | |
download | opensim-SC-c0e920c1ad130e19e7359b4fd5f230eb865439bf.zip opensim-SC-c0e920c1ad130e19e7359b4fd5f230eb865439bf.tar.gz opensim-SC-c0e920c1ad130e19e7359b4fd5f230eb865439bf.tar.bz2 opensim-SC-c0e920c1ad130e19e7359b4fd5f230eb865439bf.tar.xz |
Fix Region Max height in boundingSize parameters checking in ArchiverModule.cs to float.MaxValue .. as was changed in ArchiveReadRequest.cs in commit 71f5c2b856aeab2b535094804f15317d5dc544e1 A comparison of consistent 'default' values determines whether boundingBox check is true.
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs index cdc605b..ca94f42 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |||
@@ -112,7 +112,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
112 | float rotation = 0f; | 112 | float rotation = 0f; |
113 | Vector3 rotationCenter = new Vector3(Scene.RegionInfo.RegionSizeX / 2f, Scene.RegionInfo.RegionSizeY / 2f, 0); | 113 | Vector3 rotationCenter = new Vector3(Scene.RegionInfo.RegionSizeX / 2f, Scene.RegionInfo.RegionSizeY / 2f, 0); |
114 | Vector3 boundingOrigin = new Vector3(0f, 0f, 0f); | 114 | Vector3 boundingOrigin = new Vector3(0f, 0f, 0f); |
115 | Vector3 boundingSize = new Vector3(Scene.RegionInfo.RegionSizeX, Scene.RegionInfo.RegionSizeY, Constants.RegionHeight); | 115 | Vector3 boundingSize = new Vector3(Scene.RegionInfo.RegionSizeX, Scene.RegionInfo.RegionSizeY, float.MaxValue); |
116 | bool debug = false; | 116 | bool debug = false; |
117 | 117 | ||
118 | OptionSet options = new OptionSet(); | 118 | OptionSet options = new OptionSet(); |
@@ -183,7 +183,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
183 | { | 183 | { |
184 | try | 184 | try |
185 | { | 185 | { |
186 | boundingSize = v == null ? new Vector3(Scene.RegionInfo.RegionSizeX, Scene.RegionInfo.RegionSizeY, Constants.RegionHeight) : Vector3.Parse(v); | 186 | boundingSize = v == null ? new Vector3(Scene.RegionInfo.RegionSizeX, Scene.RegionInfo.RegionSizeY, float.MaxValue) : Vector3.Parse(v); |
187 | } | 187 | } |
188 | catch | 188 | catch |
189 | { | 189 | { |