aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-07 23:21:32 +0000
committerTeravus Ovares2007-12-07 23:21:32 +0000
commit5f516c9fb20e8c061f7b634ceeb2b21286dfcd5e (patch)
tree33928fb162f8f7bddd26e19f343ec79e2734f7ad /OpenSim
parentEnabled the TextureDownloadModule, so that hopefully I might get some feedbac... (diff)
downloadopensim-SC_OLD-5f516c9fb20e8c061f7b634ceeb2b21286dfcd5e.zip
opensim-SC_OLD-5f516c9fb20e8c061f7b634ceeb2b21286dfcd5e.tar.gz
opensim-SC_OLD-5f516c9fb20e8c061f7b634ceeb2b21286dfcd5e.tar.bz2
opensim-SC_OLD-5f516c9fb20e8c061f7b634ceeb2b21286dfcd5e.tar.xz
* 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.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/RegionInfo.cs1
-rw-r--r--OpenSim/Framework/SerializableRegionInfo.cs2
-rw-r--r--OpenSim/Framework/sLLVector3.cs25
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs6
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs12
5 files changed, 36 insertions, 10 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 5dc11ad..770107f 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -235,6 +235,7 @@ namespace OpenSim.Framework
235 m_externalHostName = ConvertFrom.ExternalHostName; 235 m_externalHostName = ConvertFrom.ExternalHostName;
236 m_remotingPort = ConvertFrom.RemotingPort; 236 m_remotingPort = ConvertFrom.RemotingPort;
237 RemotingAddress = ConvertFrom.RemotingAddress; 237 RemotingAddress = ConvertFrom.RemotingAddress;
238 RegionID = LLUUID.Zero;
238 } 239 }
239 //not in use, should swap to nini though. 240 //not in use, should swap to nini though.
240 public void LoadFromNiniSource(IConfigSource source) 241 public void LoadFromNiniSource(IConfigSource source)
diff --git a/OpenSim/Framework/SerializableRegionInfo.cs b/OpenSim/Framework/SerializableRegionInfo.cs
index c7e7d27..172d338 100644
--- a/OpenSim/Framework/SerializableRegionInfo.cs
+++ b/OpenSim/Framework/SerializableRegionInfo.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Framework
72 m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port); 72 m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port);
73 } 73 }
74 74
75 public LLUUID RegionID = LLUUID.Zero; 75 public Guid RegionID = LLUUID.Zero.UUID;
76 76
77 public uint m_remotingPort; 77 public uint m_remotingPort;
78 public uint RemotingPort 78 public uint RemotingPort
diff --git a/OpenSim/Framework/sLLVector3.cs b/OpenSim/Framework/sLLVector3.cs
new file mode 100644
index 0000000..25a9015
--- /dev/null
+++ b/OpenSim/Framework/sLLVector3.cs
@@ -0,0 +1,25 @@
1using System;
2using libsecondlife;
3
4
5namespace OpenSim.Framework
6{
7 [Serializable]
8 public class sLLVector3
9 {
10 public sLLVector3()
11 {
12
13 }
14 public sLLVector3(LLVector3 v)
15 {
16 x = v.X;
17 y = v.Y;
18 z = v.Z;
19 }
20 public float x;
21 public float y;
22 public float z;
23 }
24
25}
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index fa776ed..978111f 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -678,7 +678,7 @@ namespace OpenSim.Region.Communications.OGS1
678 678
679 if (remObject != null) 679 if (remObject != null)
680 { 680 {
681 retValue = remObject.InformRegionOfPrimCrossing(regionHandle,primID, objData); 681 retValue = remObject.InformRegionOfPrimCrossing(regionHandle,primID.UUID, objData);
682 } 682 }
683 else 683 else
684 { 684 {
@@ -751,7 +751,7 @@ namespace OpenSim.Region.Communications.OGS1
751 "/InterRegions"); 751 "/InterRegions");
752 if (remObject != null) 752 if (remObject != null)
753 { 753 {
754 retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID, position, isFlying); 754 retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID.UUID, new sLLVector3(position), isFlying);
755 } 755 }
756 else 756 else
757 { 757 {
@@ -797,7 +797,7 @@ namespace OpenSim.Region.Communications.OGS1
797 "/InterRegions"); 797 "/InterRegions");
798 if (remObject != null) 798 if (remObject != null)
799 { 799 {
800 retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID, position, isPhysical); 800 retValue = remObject.ExpectAvatarCrossing(regionHandle, agentID.UUID, new sLLVector3(position), isPhysical);
801 } 801 }
802 else 802 else
803 { 803 {
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 152107c..a7636da 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -143,11 +143,11 @@ namespace OpenSim.Region.Communications.OGS1
143 } 143 }
144 } 144 }
145 145
146 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) 146 public bool ExpectAvatarCrossing(ulong regionHandle, Guid agentID, sLLVector3 position, bool isFlying)
147 { 147 {
148 try 148 try
149 { 149 {
150 return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position, isFlying); 150 return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, new LLUUID(agentID), new LLVector3(position.x,position.y,position.z), isFlying);
151 } 151 }
152 catch (RemotingException e) 152 catch (RemotingException e)
153 { 153 {
@@ -155,11 +155,11 @@ namespace OpenSim.Region.Communications.OGS1
155 return false; 155 return false;
156 } 156 }
157 } 157 }
158 public bool InformRegionPrim(ulong regionHandle, LLUUID SceneObjectGroupID, LLVector3 position, bool isPhysical) 158 public bool InformRegionPrim(ulong regionHandle, Guid SceneObjectGroupID, sLLVector3 position, bool isPhysical)
159 { 159 {
160 try 160 try
161 { 161 {
162 return InterRegionSingleton.Instance.InformRegionPrim(regionHandle, SceneObjectGroupID, position, isPhysical); 162 return InterRegionSingleton.Instance.InformRegionPrim(regionHandle, new LLUUID(SceneObjectGroupID), new LLVector3(position.x,position.y,position.z), isPhysical);
163 } 163 }
164 catch (RemotingException e) 164 catch (RemotingException e)
165 { 165 {
@@ -168,11 +168,11 @@ namespace OpenSim.Region.Communications.OGS1
168 } 168 }
169 169
170 } 170 }
171 public bool InformRegionOfPrimCrossing(ulong regionHandle,LLUUID primID, string objData) 171 public bool InformRegionOfPrimCrossing(ulong regionHandle,Guid primID, string objData)
172 { 172 {
173 try 173 try
174 { 174 {
175 return InterRegionSingleton.Instance.ExpectPrimCrossing(regionHandle, primID, objData); 175 return InterRegionSingleton.Instance.ExpectPrimCrossing(regionHandle, new LLUUID(primID), objData);
176 } 176 }
177 catch (RemotingException e) 177 catch (RemotingException e)
178 { 178 {