From ea5d40f7f2451dd024a55e6289df70b092825e9a Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 7 May 2018 03:56:53 +0100 Subject: [PATCH] breaking map (warp3d) --- .../World/Warp3DMap/Warp3DImageModule.cs | 2 +- bin/Warp3D.dll | Bin 69120 -> 69120 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index eefd0af36d..b69ca9ecb6 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs @@ -268,7 +268,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap { float waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight; - renderer.AddPlane("Water", m_scene.RegionInfo.RegionSizeX * 0.5f + 1.0f); + renderer.AddPlane("Water", m_scene.RegionInfo.RegionSizeX * 0.5f); renderer.Scene.sceneobject("Water").setPos(m_scene.RegionInfo.RegionSizeX * 0.5f, waterHeight, m_scene.RegionInfo.RegionSizeY * 0.5f); diff --git a/bin/Warp3D.dll b/bin/Warp3D.dll index 4000aebd60b2a5c74846844f41ca168cf561ad78..21662e2abe206435545082020846bc73a90e6786 100755 GIT binary patch delta 10731 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 U?nAqh`o-qL`htJNf^_qL0c!pXxBvhE delta 10494 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