ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

* All remoting calls are now using Serializable values

Browse Source 
* There's still goofyness though, because other regions are denying child agent avatar.
* Still more debugging required.
This commit is contained in:
Teravus Ovares
2007-12-07 23:21:32 +00:00
parent 87b337ebf9
commit 5f516c9fb2
5 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -678,7 +678,7 @@ namespace OpenSim.Region.Communications.OGS1
if (remObject != null)
{
retValue = remObject.InformRegionOfPrimCrossing(regionHandle,primID, objData);
retValue = remObject.InformRegionOfPrimCrossing(regionHandle,primID.UUID, objData);
}
else
{
@@ -751,7 +751,7 @@ namespace OpenSim.Region.Communications.OGS1
"/InterRegions");
if (remObject != null)
{
retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID, position, isFlying);
retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID.UUID, new sLLVector3(position), isFlying);
}
else
{
@@ -797,7 +797,7 @@ namespace OpenSim.Region.Communications.OGS1
"/InterRegions");
if (remObject != null)
{
retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID, position, isPhysical);
retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID.UUID, new sLLVector3(position), isPhysical);
}
else
{

12
OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
View File

@@ -143,11 +143,11 @@ namespace OpenSim.Region.Communications.OGS1
}
}
public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying)
public bool ExpectAvatarCrossing(ulong regionHandle, Guid agentID, sLLVector3 position, bool isFlying)
{
try
{
return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position, isFlying);
return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, new LLUUID(agentID), new LLVector3(position.x,position.y,position.z), isFlying);
}
catch (RemotingException e)
{
@@ -155,11 +155,11 @@ namespace OpenSim.Region.Communications.OGS1
return false;
}
}
public bool InformRegionPrim(ulong regionHandle, LLUUID SceneObjectGroupID, LLVector3 position, bool isPhysical)
public bool InformRegionPrim(ulong regionHandle, Guid SceneObjectGroupID, sLLVector3 position, bool isPhysical)
{
try
{
return InterRegionSingleton.Instance.InformRegionPrim(regionHandle, SceneObjectGroupID, position, isPhysical);
return InterRegionSingleton.Instance.InformRegionPrim(regionHandle, new LLUUID(SceneObjectGroupID), new LLVector3(position.x,position.y,position.z), isPhysical);
}
catch (RemotingException e)
{
@@ -168,11 +168,11 @@ namespace OpenSim.Region.Communications.OGS1
}
}
public bool InformRegionOfPrimCrossing(ulong regionHandle,LLUUID primID, string objData)
public bool InformRegionOfPrimCrossing(ulong regionHandle,Guid primID, string objData)
{
try
{
return InterRegionSingleton.Instance.ExpectPrimCrossing(regionHandle, primID, objData);
return InterRegionSingleton.Instance.ExpectPrimCrossing(regionHandle, new LLUUID(primID), objData);
}
catch (RemotingException e)
{