ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

* More LSL changes (and fixing a compile warning)

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

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

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

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

@@ -136,7 +136,7 @@ namespace OpenSim.Region.Scripting
public Key osAvatarOnSitTarget()
{
//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)
{