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

* More LSL changes (and fixing a compile warning) 

* More attempted fixes for the phantom remoting bug.
afrisby
Adam Frisby 2007-07-17 23:47:45 +00:00
parent 9fc72755ce
commit f65808ab07
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -443,12 +443,19 @@ namespace OpenSim.Region.Communications.OGS1
/// <param name="position"></param> /// <param name="position"></param>
/// <returns></returns> /// <returns></returns>
public bool IncomingArrival(ulong regionHandle, LLUUID agentID, LLVector3 position) public bool IncomingArrival(ulong regionHandle, LLUUID agentID, LLVector3 position)
{
try
{ {
if (this.listeners.ContainsKey(regionHandle)) if (this.listeners.ContainsKey(regionHandle))
{ {
this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position); this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
return true; return true;
} }
}
catch (System.Runtime.Remoting.RemotingException e)
{
MainLog.Instance.Error("Remoting Error: Unable to connect to remote region.\n" + e.ToString());
}
return false; return false;
} }
#endregion #endregion

2
OpenSim/Region/Environment/Scenes/scripting/ScriptInterpretedAPI.cs
View File

@ -136,7 +136,7 @@ namespace OpenSim.Region.Scripting
public Key osAvatarOnSitTarget() public Key osAvatarOnSitTarget()
{ {
//TODO: Follow this as Children is chanced to be of type entity to support ScenePresences //TODO: Follow this as Children is chanced to be of type entity to support ScenePresences
foreach (KeyValuePair<Key, Primitive> Child in Task.Children) foreach (KeyValuePair<Key, EntityBase> Child in Task.Children)
{ {
if (Child.Value is ScenePresence) if (Child.Value is ScenePresence)
{ {