diff options
author | Robert Adams | 2013-09-19 12:14:21 -0700 |
---|---|---|
committer | Robert Adams | 2013-09-28 07:33:52 -0700 |
commit | 317c04fe1714631d851684e3bb294f02056bcd07 (patch) | |
tree | a4e935d869c9cb2d79f545f9b6dd1f73b01a7053 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
parent | minor: Disable logging left active on regression test TestSameSimulatorIsolat... (diff) | |
download | opensim-SC_OLD-317c04fe1714631d851684e3bb294f02056bcd07.zip opensim-SC_OLD-317c04fe1714631d851684e3bb294f02056bcd07.tar.gz opensim-SC_OLD-317c04fe1714631d851684e3bb294f02056bcd07.tar.bz2 opensim-SC_OLD-317c04fe1714631d851684e3bb294f02056bcd07.tar.xz |
VarRegion: change RegionInfo storage of region coordinates from region
count number to integer world coordinates.
Added new methods RegionWorldLoc[XY].
Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim.
Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability
of external region management packages.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 975bf2d..c9c284f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -4242,8 +4242,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4242 | m_item.ItemID, item.AssetID.ToString()); | 4242 | m_item.ItemID, item.AssetID.ToString()); |
4243 | 4243 | ||
4244 | Vector3 region = new Vector3( | 4244 | Vector3 region = new Vector3( |
4245 | World.RegionInfo.RegionLocX * Constants.RegionSize, | 4245 | World.RegionInfo.LegacyRegionLocX * Constants.RegionSize, |
4246 | World.RegionInfo.RegionLocY * Constants.RegionSize, | 4246 | World.RegionInfo.LegacyRegionLocY * Constants.RegionSize, |
4247 | 0); | 4247 | 0); |
4248 | 4248 | ||
4249 | World.AssetService.Get(item.AssetID.ToString(), this, | 4249 | World.AssetService.Get(item.AssetID.ToString(), this, |
@@ -5478,7 +5478,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
5478 | public LSL_Vector llGetRegionCorner() | 5478 | public LSL_Vector llGetRegionCorner() |
5479 | { | 5479 | { |
5480 | m_host.AddScriptLPS(1); | 5480 | m_host.AddScriptLPS(1); |
5481 | return new LSL_Vector(World.RegionInfo.RegionLocX * Constants.RegionSize, World.RegionInfo.RegionLocY * Constants.RegionSize, 0); | 5481 | return new LSL_Vector(World.RegionInfo.LegacyRegionLocX * Constants.RegionSize, World.RegionInfo.LegacyRegionLocY * Constants.RegionSize, 0); |
5482 | } | 5482 | } |
5483 | 5483 | ||
5484 | /// <summary> | 5484 | /// <summary> |
@@ -5651,8 +5651,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
5651 | 5651 | ||
5652 | List<GridRegion> neighbors = World.GridService.GetNeighbours(World.RegionInfo.ScopeID, World.RegionInfo.RegionID); | 5652 | List<GridRegion> neighbors = World.GridService.GetNeighbours(World.RegionInfo.ScopeID, World.RegionInfo.RegionID); |
5653 | 5653 | ||
5654 | uint neighborX = World.RegionInfo.RegionLocX + (uint)dir.x; | 5654 | uint neighborX = World.RegionInfo.LegacyRegionLocX + (uint)dir.x; |
5655 | uint neighborY = World.RegionInfo.RegionLocY + (uint)dir.y; | 5655 | uint neighborY = World.RegionInfo.LegacyRegionLocY + (uint)dir.y; |
5656 | 5656 | ||
5657 | foreach (GridRegion sri in neighbors) | 5657 | foreach (GridRegion sri in neighbors) |
5658 | { | 5658 | { |
@@ -10737,7 +10737,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10737 | httpHeaders["X-SecondLife-Shard"] = shard; | 10737 | httpHeaders["X-SecondLife-Shard"] = shard; |
10738 | httpHeaders["X-SecondLife-Object-Name"] = m_host.Name; | 10738 | httpHeaders["X-SecondLife-Object-Name"] = m_host.Name; |
10739 | httpHeaders["X-SecondLife-Object-Key"] = m_host.UUID.ToString(); | 10739 | httpHeaders["X-SecondLife-Object-Key"] = m_host.UUID.ToString(); |
10740 | httpHeaders["X-SecondLife-Region"] = string.Format("{0} ({1}, {2})", regionInfo.RegionName, regionInfo.RegionLocX, regionInfo.RegionLocY); | 10740 | httpHeaders["X-SecondLife-Region"] = string.Format("{0} ({1}, {2})", regionInfo.RegionName, regionInfo.LegacyRegionLocX, regionInfo.LegacyRegionLocY); |
10741 | httpHeaders["X-SecondLife-Local-Position"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000})", position.X, position.Y, position.Z); | 10741 | httpHeaders["X-SecondLife-Local-Position"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000})", position.X, position.Y, position.Z); |
10742 | httpHeaders["X-SecondLife-Local-Velocity"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000})", velocity.X, velocity.Y, velocity.Z); | 10742 | httpHeaders["X-SecondLife-Local-Velocity"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000})", velocity.X, velocity.Y, velocity.Z); |
10743 | httpHeaders["X-SecondLife-Local-Rotation"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000})", rotation.X, rotation.Y, rotation.Z, rotation.W); | 10743 | httpHeaders["X-SecondLife-Local-Rotation"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000}, {3:0.000000})", rotation.X, rotation.Y, rotation.Z, rotation.W); |