aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-07 18:20:34 +0000
committerTeravus Ovares2007-12-07 18:20:34 +0000
commit25ec01311d5c2b96f5ba5e5f1718166009912d18 (patch)
tree61720426c24b1fccdacb318e1f815759193e075d
parentAvatar Appearance refactoring /changes. Added a AvatarAppearance class, each ... (diff)
downloadopensim-SC_OLD-25ec01311d5c2b96f5ba5e5f1718166009912d18.zip
opensim-SC_OLD-25ec01311d5c2b96f5ba5e5f1718166009912d18.tar.gz
opensim-SC_OLD-25ec01311d5c2b96f5ba5e5f1718166009912d18.tar.bz2
opensim-SC_OLD-25ec01311d5c2b96f5ba5e5f1718166009912d18.tar.xz
* 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.
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs10
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs4
3 files changed, 10 insertions, 6 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 2c3a8ba..ddaaaf9 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework
40 AgentID = new LLUUID(cAgent.AgentID); 40 AgentID = new LLUUID(cAgent.AgentID);
41 SessionID = new LLUUID(cAgent.SessionID); 41 SessionID = new LLUUID(cAgent.SessionID);
42 SecureSessionID = new LLUUID(cAgent.SecureSessionID); 42 SecureSessionID = new LLUUID(cAgent.SecureSessionID);
43 startpos = cAgent.startpos; 43 startpos = new LLVector3(cAgent.startposx,cAgent.startposy,cAgent.startposz);
44 firstname = cAgent.firstname; 44 firstname = cAgent.firstname;
45 lastname = cAgent.lastname; 45 lastname = cAgent.lastname;
46 circuitcode = cAgent.circuitcode; 46 circuitcode = cAgent.circuitcode;
@@ -74,7 +74,9 @@ namespace OpenSim.Framework
74 AgentID = cAgent.AgentID.UUID; 74 AgentID = cAgent.AgentID.UUID;
75 SessionID = cAgent.SessionID.UUID; 75 SessionID = cAgent.SessionID.UUID;
76 SecureSessionID = cAgent.SecureSessionID.UUID; 76 SecureSessionID = cAgent.SecureSessionID.UUID;
77 startpos = cAgent.startpos; 77 startposx = cAgent.startpos.X;
78 startposy = cAgent.startpos.Y;
79 startposz = cAgent.startpos.Z;
78 firstname = cAgent.firstname; 80 firstname = cAgent.firstname;
79 lastname = cAgent.lastname; 81 lastname = cAgent.lastname;
80 circuitcode = cAgent.circuitcode; 82 circuitcode = cAgent.circuitcode;
@@ -86,7 +88,9 @@ namespace OpenSim.Framework
86 public Guid AgentID; 88 public Guid AgentID;
87 public Guid SessionID; 89 public Guid SessionID;
88 public Guid SecureSessionID; 90 public Guid SecureSessionID;
89 public LLVector3 startpos; 91 public float startposx;
92 public float startposy;
93 public float startposz;
90 public string firstname; 94 public string firstname;
91 public string lastname; 95 public string lastname;
92 public uint circuitcode; 96 public uint circuitcode;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 353dc28..fa776ed 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -501,7 +501,7 @@ namespace OpenSim.Region.Communications.OGS1
501 501
502 if (remObject != null) 502 if (remObject != null)
503 { 503 {
504 retValue = remObject.InformRegionOfChildAgent(regionHandle, agentData); 504 retValue = remObject.InformRegionOfChildAgent(regionHandle, new sAgentCircuitData(agentData));
505 } 505 }
506 else 506 else
507 { 507 {
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index d55528c..152107c 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -118,11 +118,11 @@ namespace OpenSim.Region.Communications.OGS1
118 { 118 {
119 } 119 }
120 120
121 public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) 121 public bool InformRegionOfChildAgent(ulong regionHandle, sAgentCircuitData agentData)
122 { 122 {
123 try 123 try
124 { 124 {
125 return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData); 125 return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, new AgentCircuitData(agentData));
126 } 126 }
127 catch (RemotingException e) 127 catch (RemotingException e)
128 { 128 {