diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index ff5c204..bd896bd 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -64,6 +64,16 @@ namespace OpenSim.Framework | |||
64 | 64 | ||
65 | m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port); | 65 | m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port); |
66 | } | 66 | } |
67 | public SimpleRegionInfo(RegionInfo ConvertFrom) | ||
68 | { | ||
69 | m_regionLocX = ConvertFrom.RegionLocX; | ||
70 | m_regionLocY = ConvertFrom.RegionLocY; | ||
71 | m_internalEndPoint = ConvertFrom.InternalEndPoint; | ||
72 | m_externalHostName = ConvertFrom.ExternalHostName; | ||
73 | m_remotingPort = ConvertFrom.RemotingPort; | ||
74 | RemotingAddress = ConvertFrom.RemotingAddress; | ||
75 | RegionID = LLUUID.Zero; | ||
76 | } | ||
67 | 77 | ||
68 | public LLUUID RegionID = LLUUID.Zero; | 78 | public LLUUID RegionID = LLUUID.Zero; |
69 | 79 | ||
@@ -238,6 +248,16 @@ namespace OpenSim.Framework | |||
238 | RemotingAddress = ConvertFrom.RemotingAddress; | 248 | RemotingAddress = ConvertFrom.RemotingAddress; |
239 | RegionID = LLUUID.Zero; | 249 | RegionID = LLUUID.Zero; |
240 | } | 250 | } |
251 | public RegionInfo(SimpleRegionInfo ConvertFrom) | ||
252 | { | ||
253 | m_regionLocX = ConvertFrom.RegionLocX; | ||
254 | m_regionLocY = ConvertFrom.RegionLocY; | ||
255 | m_internalEndPoint = ConvertFrom.InternalEndPoint; | ||
256 | m_externalHostName = ConvertFrom.ExternalHostName; | ||
257 | m_remotingPort = ConvertFrom.RemotingPort; | ||
258 | RemotingAddress = ConvertFrom.RemotingAddress; | ||
259 | RegionID = LLUUID.Zero; | ||
260 | } | ||
241 | //not in use, should swap to nini though. | 261 | //not in use, should swap to nini though. |
242 | public void LoadFromNiniSource(IConfigSource source) | 262 | public void LoadFromNiniSource(IConfigSource source) |
243 | { | 263 | { |