diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |
parent | bad merge? (diff) | |
download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 5d8f0f6..a87ee73 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -829,10 +829,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
829 | private void TeleportAgent(string agent, int regionX, int regionY, | 829 | private void TeleportAgent(string agent, int regionX, int regionY, |
830 | LSL_Types.Vector3 position, LSL_Types.Vector3 lookat, bool relaxRestrictions) | 830 | LSL_Types.Vector3 position, LSL_Types.Vector3 lookat, bool relaxRestrictions) |
831 | { | 831 | { |
832 | <<<<<<< HEAD | ||
833 | // ulong regionHandle = Util.UIntsToLong(((uint)regionX * (uint)Constants.RegionSize), ((uint)regionY * (uint)Constants.RegionSize)); | ||
834 | ======= | ||
835 | >>>>>>> avn/ubitvar | ||
836 | ulong regionHandle = Util.RegionLocToHandle((uint)regionX, (uint)regionY); | 832 | ulong regionHandle = Util.RegionLocToHandle((uint)regionX, (uint)regionY); |
837 | 833 | ||
838 | m_host.AddScriptLPS(1); | 834 | m_host.AddScriptLPS(1); |
@@ -3265,15 +3261,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3265 | } | 3261 | } |
3266 | else | 3262 | else |
3267 | { | 3263 | { |
3268 | <<<<<<< HEAD | ||
3269 | Scene scene = m_ScriptEngine.World; | 3264 | Scene scene = m_ScriptEngine.World; |
3270 | GridRegion region = scene.GridService.GetRegionByUUID(UUID.Zero, World.RegionInfo.RegionID); | 3265 | GridRegion region = scene.GridService.GetRegionByUUID(UUID.Zero, World.RegionInfo.RegionID); |
3271 | return new LSL_Vector((float)region.RegionSizeX, (float)region.RegionSizeX, Constants.RegionHeight); | 3266 | return new LSL_Vector(region.RegionSizeX, region.RegionSizeY, Constants.RegionHeight); |
3272 | ======= | ||
3273 | return new LSL_Vector((float)World.RegionInfo.RegionSizeX, | ||
3274 | (float)World.RegionInfo.RegionSizeY, | ||
3275 | (float)World.RegionInfo.RegionSizeZ ); | ||
3276 | >>>>>>> avn/ubitvar | ||
3277 | } | 3267 | } |
3278 | } | 3268 | } |
3279 | 3269 | ||