aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r--OpenSim/Framework/RegionInfo.cs42
1 files changed, 22 insertions, 20 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index ee64bf2..1d9d9ec 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -41,20 +41,34 @@ namespace OpenSim.Framework
41 // private static readonly log4net.ILog m_log 41 // private static readonly log4net.ILog m_log
42 // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 42 // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
43 43
44 protected bool Allow_Alternate_Ports; 44 /// <summary>
45 public bool m_allow_alternate_ports;
46 protected string m_externalHostName;
47
48 /// <value>
49 /// The port by which http communication occurs with the region (most noticeably, CAPS communication) 45 /// The port by which http communication occurs with the region (most noticeably, CAPS communication)
50 /// </value> 46 /// </summary>
47 public uint HttpPort
48 {
49 get { return m_httpPort; }
50 set { m_httpPort = value; }
51 }
51 protected uint m_httpPort; 52 protected uint m_httpPort;
53
54 /// <summary>
55 /// A well-formed URI for the host region server (namely "http://" + ExternalHostName)
56 /// </summary>
57 public string ServerURI
58 {
59 get { return m_serverURI; }
60 set { m_serverURI = value; }
61 }
62 protected string m_serverURI;
52 63
64 protected bool Allow_Alternate_Ports;
65 public bool m_allow_alternate_ports;
66 protected string m_externalHostName;
67
53 protected IPEndPoint m_internalEndPoint; 68 protected IPEndPoint m_internalEndPoint;
54 protected uint? m_regionLocX; 69 protected uint? m_regionLocX;
55 protected uint? m_regionLocY; 70 protected uint? m_regionLocY;
56 protected uint m_remotingPort; 71 protected uint m_remotingPort;
57 protected string m_serverURI;
58 public LLUUID RegionID = LLUUID.Zero; 72 public LLUUID RegionID = LLUUID.Zero;
59 public string RemotingAddress; 73 public string RemotingAddress;
60 74
@@ -101,18 +115,6 @@ namespace OpenSim.Framework
101 set { m_remotingPort = value; } 115 set { m_remotingPort = value; }
102 } 116 }
103 117
104 public uint HttpPort
105 {
106 get { return m_httpPort; }
107 set { m_httpPort = value; }
108 }
109
110 public string ServerURI
111 {
112 get { return m_serverURI; }
113 set { m_serverURI = value; }
114 }
115
116 /// <value> 118 /// <value>
117 /// This accessor can throw all the exceptions that Dns.GetHostAddresses can throw. 119 /// This accessor can throw all the exceptions that Dns.GetHostAddresses can throw.
118 /// 120 ///