Merge commit '03e421bf3d796bf3498f4f3311c59ce04fb1fea1' into careminster
commit
7d5eadf753
|
@ -4314,33 +4314,33 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
// }
|
||||
// }
|
||||
|
||||
/// <summary>
|
||||
/// Triggered when an agent crosses into this sim. Also happens on initial login.
|
||||
/// </summary>
|
||||
/// <param name="agentID"></param>
|
||||
/// <param name="position"></param>
|
||||
/// <param name="isFlying"></param>
|
||||
public virtual void AgentCrossing(UUID agentID, Vector3 position, bool isFlying)
|
||||
{
|
||||
ScenePresence presence = GetScenePresence(agentID);
|
||||
if (presence != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
presence.MakeRootAgent(position, isFlying);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
m_log.ErrorFormat("[SCENE]: Unable to do agent crossing, exception {0}{1}", e.Message, e.StackTrace);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
m_log.ErrorFormat(
|
||||
"[SCENE]: Could not find presence for agent {0} crossing into scene {1}",
|
||||
agentID, RegionInfo.RegionName);
|
||||
}
|
||||
}
|
||||
// /// <summary>
|
||||
// /// Triggered when an agent crosses into this sim. Also happens on initial login.
|
||||
// /// </summary>
|
||||
// /// <param name="agentID"></param>
|
||||
// /// <param name="position"></param>
|
||||
// /// <param name="isFlying"></param>
|
||||
// public virtual void AgentCrossing(UUID agentID, Vector3 position, bool isFlying)
|
||||
// {
|
||||
// ScenePresence presence = GetScenePresence(agentID);
|
||||
// if (presence != null)
|
||||
// {
|
||||
// try
|
||||
// {
|
||||
// presence.MakeRootAgent(position, isFlying);
|
||||
// }
|
||||
// catch (Exception e)
|
||||
// {
|
||||
// m_log.ErrorFormat("[SCENE]: Unable to do agent crossing, exception {0}{1}", e.Message, e.StackTrace);
|
||||
// }
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// m_log.ErrorFormat(
|
||||
// "[SCENE]: Could not find presence for agent {0} crossing into scene {1}",
|
||||
// agentID, RegionInfo.RegionName);
|
||||
// }
|
||||
// }
|
||||
|
||||
/// <summary>
|
||||
/// We've got an update about an agent that sees into this region,
|
||||
|
|
Loading…
Reference in New Issue