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

Merge commit '03e421bf3d796bf3498f4f3311c59ce04fb1fea1' into careminster

avinationmerge
Melanie 2013-03-29 01:52:45 +00:00
parent 6954024fb2 03e421bf3d
commit 7d5eadf753
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
OpenSim/Region/Framework/Scenes/Scene.cs
View File

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