diff options
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index b5d6869..fc6da57 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -71,6 +71,7 @@ namespace OpenSim.Framework | |||
71 | m_internalEndPoint = ConvertFrom.InternalEndPoint; | 71 | m_internalEndPoint = ConvertFrom.InternalEndPoint; |
72 | m_externalHostName = ConvertFrom.ExternalHostName; | 72 | m_externalHostName = ConvertFrom.ExternalHostName; |
73 | m_remotingPort = ConvertFrom.RemotingPort; | 73 | m_remotingPort = ConvertFrom.RemotingPort; |
74 | m_httpPort = ConvertFrom.HttpPort; | ||
74 | m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports; | 75 | m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports; |
75 | RemotingAddress = ConvertFrom.RemotingAddress; | 76 | RemotingAddress = ConvertFrom.RemotingAddress; |
76 | RegionID = LLUUID.Zero; | 77 | RegionID = LLUUID.Zero; |
@@ -79,16 +80,27 @@ namespace OpenSim.Framework | |||
79 | 80 | ||
80 | public LLUUID RegionID = LLUUID.Zero; | 81 | public LLUUID RegionID = LLUUID.Zero; |
81 | 82 | ||
82 | public uint m_remotingPort; | 83 | protected uint m_remotingPort; |
83 | 84 | ||
84 | public uint RemotingPort | 85 | public uint RemotingPort |
85 | { | 86 | { |
86 | get { return m_remotingPort; } | 87 | get { return m_remotingPort; } |
87 | set { m_remotingPort = value; } | 88 | set { m_remotingPort = value; } |
88 | } | 89 | } |
90 | |||
91 | /// <value> | ||
92 | /// The port by which http communication occurs with the region (most noticeably, CAPS communication) | ||
93 | /// </value> | ||
94 | protected uint m_httpPort; | ||
95 | public uint HttpPort | ||
96 | { | ||
97 | get { return m_httpPort; } | ||
98 | set { m_httpPort = value; } | ||
99 | } | ||
100 | |||
89 | public bool m_allow_alternate_ports; | 101 | public bool m_allow_alternate_ports; |
90 | 102 | ||
91 | public string m_serverURI; | 103 | protected string m_serverURI; |
92 | public string ServerURI | 104 | public string ServerURI |
93 | { | 105 | { |
94 | get | 106 | get |
@@ -142,7 +154,6 @@ namespace OpenSim.Framework | |||
142 | } | 154 | } |
143 | 155 | ||
144 | protected string m_externalHostName; | 156 | protected string m_externalHostName; |
145 | |||
146 | public string ExternalHostName | 157 | public string ExternalHostName |
147 | { | 158 | { |
148 | get { return m_externalHostName; } | 159 | get { return m_externalHostName; } |