aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDiva Canto2009-09-22 14:46:05 -0700
committerDiva Canto2009-09-22 14:46:05 -0700
commitffd30b8ac31bc408316079ba86076bf9e984a8be (patch)
tree47c85aa445f21037576d6ce5e2df8f7477289343 /OpenSim/Framework
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-ffd30b8ac31bc408316079ba86076bf9e984a8be.zip
opensim-SC-ffd30b8ac31bc408316079ba86076bf9e984a8be.tar.gz
opensim-SC-ffd30b8ac31bc408316079ba86076bf9e984a8be.tar.bz2
opensim-SC-ffd30b8ac31bc408316079ba86076bf9e984a8be.tar.xz
Moved RegionName from RegionInfo to SimpleRegionInfo.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/RegionInfo.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index afd50a9..0dc35a5 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;
@@ -284,7 +291,6 @@ namespace OpenSim.Framework
284 public UUID originRegionID = UUID.Zero; 291 public UUID originRegionID = UUID.Zero;
285 public string proxyUrl = ""; 292 public string proxyUrl = "";
286 public int ProxyOffset = 0; 293 public int ProxyOffset = 0;
287 public string RegionName = String.Empty;
288 public string regionSecret = UUID.Random().ToString(); 294 public string regionSecret = UUID.Random().ToString();
289 295
290 public string osSecret; 296 public string osSecret;