diff options
author | Justin Clark-Casey (justincc) | 2009-09-24 17:35:03 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-09-24 17:35:03 +0100 |
commit | ad753d784cfefacd8fb745a1431bf98feac9bbd6 (patch) | |
tree | 795ec1ba25eada570c342746f07654849a7199f4 /OpenSim/Framework/RegionInfo.cs | |
parent | minor: make rest (not comm) modules less noisy if they are disabled (diff) | |
parent | Changed name of the hyperlink XMLRPC method to linkk-region, so that it doesn... (diff) | |
download | opensim-SC_OLD-ad753d784cfefacd8fb745a1431bf98feac9bbd6.zip opensim-SC_OLD-ad753d784cfefacd8fb745a1431bf98feac9bbd6.tar.gz opensim-SC_OLD-ad753d784cfefacd8fb745a1431bf98feac9bbd6.tar.bz2 opensim-SC_OLD-ad753d784cfefacd8fb745a1431bf98feac9bbd6.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index afd50a9..cee1d4b 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -64,6 +64,13 @@ namespace OpenSim.Framework | |||
64 | } | 64 | } |
65 | protected string m_serverURI; | 65 | protected string m_serverURI; |
66 | 66 | ||
67 | public string RegionName | ||
68 | { | ||
69 | get { return m_regionName; } | ||
70 | set { m_regionName = value; } | ||
71 | } | ||
72 | protected string m_regionName = String.Empty; | ||
73 | |||
67 | protected bool Allow_Alternate_Ports; | 74 | protected bool Allow_Alternate_Ports; |
68 | public bool m_allow_alternate_ports; | 75 | public bool m_allow_alternate_ports; |
69 | protected string m_externalHostName; | 76 | protected string m_externalHostName; |
@@ -101,6 +108,7 @@ namespace OpenSim.Framework | |||
101 | 108 | ||
102 | public SimpleRegionInfo(RegionInfo ConvertFrom) | 109 | public SimpleRegionInfo(RegionInfo ConvertFrom) |
103 | { | 110 | { |
111 | m_regionName = ConvertFrom.RegionName; | ||
104 | m_regionLocX = ConvertFrom.RegionLocX; | 112 | m_regionLocX = ConvertFrom.RegionLocX; |
105 | m_regionLocY = ConvertFrom.RegionLocY; | 113 | m_regionLocY = ConvertFrom.RegionLocY; |
106 | m_internalEndPoint = ConvertFrom.InternalEndPoint; | 114 | m_internalEndPoint = ConvertFrom.InternalEndPoint; |
@@ -284,7 +292,6 @@ namespace OpenSim.Framework | |||
284 | public UUID originRegionID = UUID.Zero; | 292 | public UUID originRegionID = UUID.Zero; |
285 | public string proxyUrl = ""; | 293 | public string proxyUrl = ""; |
286 | public int ProxyOffset = 0; | 294 | public int ProxyOffset = 0; |
287 | public string RegionName = String.Empty; | ||
288 | public string regionSecret = UUID.Random().ToString(); | 295 | public string regionSecret = UUID.Random().ToString(); |
289 | 296 | ||
290 | public string osSecret; | 297 | public string osSecret; |