aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
authorRobert Adams2013-12-14 07:53:01 -0800
committerRobert Adams2013-12-14 07:53:01 -0800
commit13a9a4b653c5470e6a450bfd9b2049273a4ef7b2 (patch)
tree1168d93ebfff04893ec05a32c6bad456e1d00d32 /OpenSim/Region/ScriptEngine/Shared/Api
parentMerge branch 'master' into varregion (diff)
downloadopensim-SC_OLD-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.zip
opensim-SC_OLD-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.tar.gz
opensim-SC_OLD-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.tar.bz2
opensim-SC_OLD-13a9a4b653c5470e6a450bfd9b2049273a4ef7b2.tar.xz
varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.
Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z. This keeps the downward compatibility and follows the scheme of 'region' and 'world' location naming that is happening in the Util module.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index f46bdf3..6861865 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4244,7 +4244,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4244 DataserverPlugin.RegisterRequest(m_host.LocalId, 4244 DataserverPlugin.RegisterRequest(m_host.LocalId,
4245 m_item.ItemID, item.AssetID.ToString()); 4245 m_item.ItemID, item.AssetID.ToString());
4246 4246
4247 Vector3 region = new Vector3(World.RegionInfo.RegionWorldLocX, World.RegionInfo.RegionWorldLocY, 0); 4247 Vector3 region = new Vector3(World.RegionInfo.WorldLocX, World.RegionInfo.WorldLocY, 0);
4248 4248
4249 World.AssetService.Get(item.AssetID.ToString(), this, 4249 World.AssetService.Get(item.AssetID.ToString(), this,
4250 delegate(string i, object sender, AssetBase a) 4250 delegate(string i, object sender, AssetBase a)
@@ -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.RegionWorldLocX, World.RegionInfo.RegionWorldLocY, 0); 5481 return new LSL_Vector(World.RegionInfo.WorldLocX, World.RegionInfo.WorldLocY, 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.LegacyRegionLocX + (uint)dir.x; 5654 uint neighborX = World.RegionInfo.RegionLocX + (uint)dir.x;
5655 uint neighborY = World.RegionInfo.LegacyRegionLocY + (uint)dir.y; 5655 uint neighborY = World.RegionInfo.RegionLocY + (uint)dir.y;
5656 5656
5657 foreach (GridRegion sri in neighbors) 5657 foreach (GridRegion sri in neighbors)
5658 { 5658 {
@@ -10767,7 +10767,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10767 httpHeaders["X-SecondLife-Shard"] = shard; 10767 httpHeaders["X-SecondLife-Shard"] = shard;
10768 httpHeaders["X-SecondLife-Object-Name"] = m_host.Name; 10768 httpHeaders["X-SecondLife-Object-Name"] = m_host.Name;
10769 httpHeaders["X-SecondLife-Object-Key"] = m_host.UUID.ToString(); 10769 httpHeaders["X-SecondLife-Object-Key"] = m_host.UUID.ToString();
10770 httpHeaders["X-SecondLife-Region"] = string.Format("{0} ({1}, {2})", regionInfo.RegionName, regionInfo.LegacyRegionLocX, regionInfo.LegacyRegionLocY); 10770 httpHeaders["X-SecondLife-Region"] = string.Format("{0} ({1}, {2})", regionInfo.RegionName, regionInfo.RegionLocX, regionInfo.RegionLocY);
10771 httpHeaders["X-SecondLife-Local-Position"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000})", position.X, position.Y, position.Z); 10771 httpHeaders["X-SecondLife-Local-Position"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000})", position.X, position.Y, position.Z);
10772 httpHeaders["X-SecondLife-Local-Velocity"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000})", velocity.X, velocity.Y, velocity.Z); 10772 httpHeaders["X-SecondLife-Local-Velocity"] = string.Format("({0:0.000000}, {1:0.000000}, {2:0.000000})", velocity.X, velocity.Y, velocity.Z);
10773 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); 10773 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);