aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/SerializableRegionInfo.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/SerializableRegionInfo.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/SerializableRegionInfo.cs b/OpenSim/Framework/SerializableRegionInfo.cs
index 4965a43..2052470 100644
--- a/OpenSim/Framework/SerializableRegionInfo.cs
+++ b/OpenSim/Framework/SerializableRegionInfo.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using System.Net; 29using System.Net;
30using System.Net.Sockets; 30using System.Net.Sockets;
31using libsecondlife; 31using OpenMetaverse;
32 32
33namespace OpenSim.Framework 33namespace OpenSim.Framework
34{ 34{
@@ -47,14 +47,14 @@ namespace OpenSim.Framework
47 protected uint m_httpPort = 9000; 47 protected uint m_httpPort = 9000;
48 48
49 protected IPEndPoint m_internalEndPoint; 49 protected IPEndPoint m_internalEndPoint;
50 protected Guid m_originRegionID = LLUUID.Zero.UUID; 50 protected Guid m_originRegionID = UUID.Zero.Guid;
51 protected string m_proxyUrl; 51 protected string m_proxyUrl;
52 protected uint? m_regionLocX; 52 protected uint? m_regionLocX;
53 protected uint? m_regionLocY; 53 protected uint? m_regionLocY;
54 protected string m_regionName; 54 protected string m_regionName;
55 public uint m_remotingPort; 55 public uint m_remotingPort;
56 protected string m_serverURI; 56 protected string m_serverURI;
57 public Guid RegionID = LLUUID.Zero.UUID; 57 public Guid RegionID = UUID.Zero.Guid;
58 public string RemotingAddress; 58 public string RemotingAddress;
59 59
60 /// <summary> 60 /// <summary>
@@ -181,10 +181,10 @@ namespace OpenSim.Framework
181 set { m_proxyUrl = value; } 181 set { m_proxyUrl = value; }
182 } 182 }
183 183
184 public LLUUID OriginRegionID 184 public UUID OriginRegionID
185 { 185 {
186 get { return new LLUUID(m_originRegionID); } 186 get { return new UUID(m_originRegionID); }
187 set { m_originRegionID = value.UUID; } 187 set { m_originRegionID = value.Guid; }
188 } 188 }
189 189
190 public string RegionName 190 public string RegionName
@@ -199,4 +199,4 @@ namespace OpenSim.Framework
199 set { m_serverURI = value; } 199 set { m_serverURI = value; }
200 } 200 }
201 } 201 }
202} \ No newline at end of file 202}