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

* All remoting calls are now using Serializable values 

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

1
OpenSim/Framework/RegionInfo.cs
View File

@ -235,6 +235,7 @@ namespace OpenSim.Framework
m_externalHostName = ConvertFrom.ExternalHostName; m_externalHostName = ConvertFrom.ExternalHostName;
m_remotingPort = ConvertFrom.RemotingPort; m_remotingPort = ConvertFrom.RemotingPort;
RemotingAddress = ConvertFrom.RemotingAddress; RemotingAddress = ConvertFrom.RemotingAddress;
RegionID = LLUUID.Zero;
} }
//not in use, should swap to nini though. //not in use, should swap to nini though.
public void LoadFromNiniSource(IConfigSource source) public void LoadFromNiniSource(IConfigSource source)

2
OpenSim/Framework/SerializableRegionInfo.cs
View File

@ -72,7 +72,7 @@ namespace OpenSim.Framework
m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port); m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port);
} }
public LLUUID RegionID = LLUUID.Zero; public Guid RegionID = LLUUID.Zero.UUID;
public uint m_remotingPort; public uint m_remotingPort;
public uint RemotingPort public uint RemotingPort

25
OpenSim/Framework/sLLVector3.cs Normal file
View File

@ -0,0 +1,25 @@
using System;
using libsecondlife;
namespace OpenSim.Framework
{
[Serializable]
public class sLLVector3
{
public sLLVector3()
{
}
public sLLVector3(LLVector3 v)
{
x = v.X;
y = v.Y;
z = v.Z;
}
public float x;
public float y;
public float z;
}
}

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

@ -678,7 +678,7 @@ namespace OpenSim.Region.Communications.OGS1
if (remObject != null) if (remObject != null)
{ {
retValue = remObject.InformRegionOfPrimCrossing(regionHandle,primID, objData); retValue = remObject.InformRegionOfPrimCrossing(regionHandle,primID.UUID, objData);
} }
else else
{ {
@ -751,7 +751,7 @@ namespace OpenSim.Region.Communications.OGS1
"/InterRegions"); "/InterRegions");
if (remObject != null) if (remObject != null)
{ {
retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID, position, isFlying); retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID.UUID, new sLLVector3(position), isFlying);
} }
else else
{ {
@ -797,7 +797,7 @@ namespace OpenSim.Region.Communications.OGS1
"/InterRegions"); "/InterRegions");
if (remObject != null) if (remObject != null)
{ {
retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID, position, isPhysical); retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID.UUID, new sLLVector3(position), isPhysical);
} }
else 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 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) catch (RemotingException e)
{ {
@ -155,11 +155,11 @@ namespace OpenSim.Region.Communications.OGS1
return false; 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 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) 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 try
{ {
return InterRegionSingleton.Instance.ExpectPrimCrossing(regionHandle, primID, objData); return InterRegionSingleton.Instance.ExpectPrimCrossing(regionHandle, new LLUUID(primID), objData);
} }
catch (RemotingException e) catch (RemotingException e)
{ {