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

* Serialized data properly for the InterRegionSingleton InformRegionChild method 

* This isn't really that big of a deal(worth lots of commits) doing this, however I'm doing it in small chunks because I'm multi-tasking.
afrisby
Teravus Ovares 2007-12-07 18:20:34 +00:00
parent e23290eff6
commit 25ec01311d
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Framework/AgentCircuitData.cs
View File

@ -40,7 +40,7 @@ namespace OpenSim.Framework
AgentID = new LLUUID(cAgent.AgentID); AgentID = new LLUUID(cAgent.AgentID);
SessionID = new LLUUID(cAgent.SessionID); SessionID = new LLUUID(cAgent.SessionID);
SecureSessionID = new LLUUID(cAgent.SecureSessionID); SecureSessionID = new LLUUID(cAgent.SecureSessionID);
startpos = cAgent.startpos; startpos = new LLVector3(cAgent.startposx,cAgent.startposy,cAgent.startposz);
firstname = cAgent.firstname; firstname = cAgent.firstname;
lastname = cAgent.lastname; lastname = cAgent.lastname;
circuitcode = cAgent.circuitcode; circuitcode = cAgent.circuitcode;
@ -74,7 +74,9 @@ namespace OpenSim.Framework
AgentID = cAgent.AgentID.UUID; AgentID = cAgent.AgentID.UUID;
SessionID = cAgent.SessionID.UUID; SessionID = cAgent.SessionID.UUID;
SecureSessionID = cAgent.SecureSessionID.UUID; SecureSessionID = cAgent.SecureSessionID.UUID;
startpos = cAgent.startpos; startposx = cAgent.startpos.X;
startposy = cAgent.startpos.Y;
startposz = cAgent.startpos.Z;
firstname = cAgent.firstname; firstname = cAgent.firstname;
lastname = cAgent.lastname; lastname = cAgent.lastname;
circuitcode = cAgent.circuitcode; circuitcode = cAgent.circuitcode;
@ -86,7 +88,9 @@ namespace OpenSim.Framework
public Guid AgentID; public Guid AgentID;
public Guid SessionID; public Guid SessionID;
public Guid SecureSessionID; public Guid SecureSessionID;
public LLVector3 startpos; public float startposx;
public float startposy;
public float startposz;
public string firstname; public string firstname;
public string lastname; public string lastname;
public uint circuitcode; public uint circuitcode;

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

@ -501,7 +501,7 @@ namespace OpenSim.Region.Communications.OGS1
if (remObject != null) if (remObject != null)
{ {
retValue = remObject.InformRegionOfChildAgent(regionHandle, agentData); retValue = remObject.InformRegionOfChildAgent(regionHandle, new sAgentCircuitData(agentData));
} }
else else
{ {

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

@ -118,11 +118,11 @@ namespace OpenSim.Region.Communications.OGS1
{ {
} }
public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) public bool InformRegionOfChildAgent(ulong regionHandle, sAgentCircuitData agentData)
{ {
try try
{ {
return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData); return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, new AgentCircuitData(agentData));
} }
catch (RemotingException e) catch (RemotingException e)
{ {