OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename a few things to reduce confusion between regions wold location and grid location (a lot more elsewhere)

LSLKeyTest
UbitUmarov 2016-07-31 01:56:44 +01:00
parent db7f1aaa2f
commit a4caedceae
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/Util.cs
View File

@ -377,9 +377,11 @@ namespace OpenSim.Framework
return Utils.UIntsToLong(X, Y); return Utils.UIntsToLong(X, Y);
} }
public static ulong RegionLocToHandle(uint X, uint Y) public static ulong RegionGridLocToHandle(uint X, uint Y)
{ {
return Utils.UIntsToLong(Util.RegionToWorldLoc(X), Util.RegionToWorldLoc(Y)); ulong handle = X << 40; // shift to higher half and mult by 256)
handle |= (Y << 8); // mult by 256)
return handle;
} }
public static void RegionHandleToWorldLoc(ulong handle, out uint X, out uint Y) public static void RegionHandleToWorldLoc(ulong handle, out uint X, out uint Y)
@ -1303,7 +1305,7 @@ namespace OpenSim.Framework
} }
catch (Exception e) catch (Exception e)
{ {
m_log.WarnFormat("[UTILS]: Exception copying configuration file {0} to {1}: {2}", exampleConfigFile, configFile, e.Message); m_log.WarnFormat("[UTILS]: Exception copying configuration file {0} to {1}: {2}", configFile, exampleConfigFile, e.Message);
return false; return false;
} }
} }

2
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -1588,7 +1588,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
agent.Scene.RequestTeleportLocation( agent.Scene.RequestTeleportLocation(
agent.ControllingClient, agent.ControllingClient,
Util.RegionLocToHandle(regionX, regionY), Util.RegionGridLocToHandle(regionX, regionY),
position, position,
agent.Lookat, agent.Lookat,
(uint)Constants.TeleportFlags.ViaLocation); (uint)Constants.TeleportFlags.ViaLocation);

12
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -852,19 +852,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
} }
public void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat) public void osTeleportAgent(string agent, int regionGridX, int regionGridY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
{ {
// High because there is no security check. High griefer potential // High because there is no security check. High griefer potential
// //
CheckThreatLevel(ThreatLevel.Severe, "osTeleportAgent"); CheckThreatLevel(ThreatLevel.Severe, "osTeleportAgent");
TeleportAgent(agent, regionX, regionY, position, lookat, false); TeleportAgent(agent, regionGridX, regionGridY, position, lookat, false);
} }
private void TeleportAgent(string agent, int regionX, int regionY, private void TeleportAgent(string agent, int regionGridX, int regionGridY,
LSL_Types.Vector3 position, LSL_Types.Vector3 lookat, bool relaxRestrictions) LSL_Types.Vector3 position, LSL_Types.Vector3 lookat, bool relaxRestrictions)
{ {
ulong regionHandle = Util.RegionLocToHandle((uint)regionX, (uint)regionY); ulong regionHandle = Util.RegionGridLocToHandle((uint)regionGridX, (uint)regionGridY);
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
UUID agentId = new UUID(); UUID agentId = new UUID();
@ -917,11 +917,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
osTeleportOwner(World.RegionInfo.RegionName, position, lookat); osTeleportOwner(World.RegionInfo.RegionName, position, lookat);
} }
public void osTeleportOwner(int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat) public void osTeleportOwner(int regionGridX, int regionGridY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat)
{ {
CheckThreatLevel(ThreatLevel.None, "osTeleportOwner"); CheckThreatLevel(ThreatLevel.None, "osTeleportOwner");
TeleportAgent(m_host.OwnerID.ToString(), regionX, regionY, position, lookat, true); TeleportAgent(m_host.OwnerID.ToString(), regionGridX, regionGridY, position, lookat, true);
} }
///<summary> ///<summary>