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

* minor: Just some minor log elaboration to reveal in the logs where a teleport is being directed rather than just its position

0.6.3-post-fixes
Justin Clarke Casey 2009-01-19 17:15:27 +00:00
parent 8e01f75784
commit 96e15058d5
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs
View File

@ -184,6 +184,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
return false;
}
public bool SendReleaseAgent(ulong regionHandle, UUID id, string uri)
{
// Try local first
@ -214,6 +215,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
#endregion /* IInterregionComms */
#region DoWork functions for the above public interface
//-------------------------------------------------------------------
// Internal functions for the above public interface
//-------------------------------------------------------------------
@ -385,7 +387,6 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
}
return true;
}
protected bool DoReleaseAgentCall(ulong regionHandle, UUID id, string uri)
@ -418,7 +419,6 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
}
return true;
}
protected bool DoCloseAgentCall(RegionInfo region, UUID id)
@ -453,10 +453,9 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
}
return true;
}
#endregion /* DoWork */
#endregion /* Do Work */
#region Incoming calls from remote instances
@ -653,9 +652,11 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST
responsedata["int_response_code"] = 200;
responsedata["str_response_string"] = "OpenSim agent " + id.ToString();
}
#endregion
#region Misc
/// <summary>
/// Extract the param from an uri.
/// </summary>

11
OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
View File

@ -680,8 +680,6 @@ namespace OpenSim.Region.Environment.Scenes
public virtual void RequestTeleportToLocation(ScenePresence avatar, ulong regionHandle, Vector3 position,
Vector3 lookAt, uint teleportFlags)
{
m_log.DebugFormat("[SCENE COMMUNICATION SERVICE]: RequestTeleportToLocation {0} ", position.ToString());
if (!avatar.Scene.Permissions.CanTeleport(avatar.UUID))
return;
@ -691,6 +689,10 @@ namespace OpenSim.Region.Environment.Scenes
if (regionHandle == m_regionInfo.RegionHandle)
{
m_log.DebugFormat(
"[SCENE COMMUNICATION SERVICE]: RequestTeleportToLocation {0} within {1}",
position, m_regionInfo.RegionName);
// Teleport within the same region
if (position.X < 0 || position.X > Constants.RegionSize || position.Y < 0 || position.Y > Constants.RegionSize || position.Z < 0)
{
@ -723,6 +725,10 @@ namespace OpenSim.Region.Environment.Scenes
RegionInfo reg = RequestNeighbouringRegionInfo(regionHandle);
if (reg != null)
{
m_log.DebugFormat(
"[SCENE COMMUNICATION SERVICE]: RequestTeleportToLocation to {0} {1}",
position, reg.RegionName);
if (eq == null)
avatar.ControllingClient.SendTeleportLocationStart();
@ -870,6 +876,7 @@ namespace OpenSim.Region.Environment.Scenes
avatar.ControllingClient.SendTeleportFailed("Problems connecting to destination.");
ResetFromTransit(avatar.UUID);
// Yikes! We should just have a ref to scene here.
avatar.Scene.InformClientOfNeighbours(avatar);