aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
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/Framework
parentEnabled the TextureDownloadModule, so that hopefully I might get some feedbac... (diff)
downloadopensim-SC-5f516c9fb20e8c061f7b634ceeb2b21286dfcd5e.zip
opensim-SC-5f516c9fb20e8c061f7b634ceeb2b21286dfcd5e.tar.gz
opensim-SC-5f516c9fb20e8c061f7b634ceeb2b21286dfcd5e.tar.bz2
opensim-SC-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/Framework')
-rw-r--r--OpenSim/Framework/RegionInfo.cs1
-rw-r--r--OpenSim/Framework/SerializableRegionInfo.cs2
-rw-r--r--OpenSim/Framework/sLLVector3.cs25
3 files changed, 27 insertions, 1 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}