diff options
Diffstat (limited to 'OpenSim/Services/Interfaces/IGridService.cs')
-rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index c45ea76..ce50ab0 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
@@ -126,7 +126,7 @@ namespace OpenSim.Services.Interfaces | |||
126 | 126 | ||
127 | public class GridRegion | 127 | public class GridRegion |
128 | { | 128 | { |
129 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 129 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
130 | 130 | ||
131 | #pragma warning disable 414 | 131 | #pragma warning disable 414 |
132 | private static readonly string LogHeader = "[GRID REGION]"; | 132 | private static readonly string LogHeader = "[GRID REGION]"; |
@@ -135,12 +135,7 @@ namespace OpenSim.Services.Interfaces | |||
135 | /// <summary> | 135 | /// <summary> |
136 | /// The port by which http communication occurs with the region | 136 | /// The port by which http communication occurs with the region |
137 | /// </summary> | 137 | /// </summary> |
138 | public uint HttpPort | 138 | public uint HttpPort { get; set; } |
139 | { | ||
140 | get { return m_httpPort; } | ||
141 | set { m_httpPort = value; } | ||
142 | } | ||
143 | protected uint m_httpPort; | ||
144 | 139 | ||
145 | /// <summary> | 140 | /// <summary> |
146 | /// A well-formed URI for the host region server (namely "http://" + ExternalHostName) | 141 | /// A well-formed URI for the host region server (namely "http://" + ExternalHostName) |
@@ -151,10 +146,10 @@ namespace OpenSim.Services.Interfaces | |||
151 | if (!String.IsNullOrEmpty(m_serverURI)) { | 146 | if (!String.IsNullOrEmpty(m_serverURI)) { |
152 | return m_serverURI; | 147 | return m_serverURI; |
153 | } else { | 148 | } else { |
154 | if (m_httpPort == 0) | 149 | if (HttpPort == 0) |
155 | return "http://" + m_externalHostName + "/"; | 150 | return "http://" + m_externalHostName + "/"; |
156 | else | 151 | else |
157 | return "http://" + m_externalHostName + ":" + m_httpPort + "/"; | 152 | return "http://" + m_externalHostName + ":" + HttpPort + "/"; |
158 | } | 153 | } |
159 | } | 154 | } |
160 | set { | 155 | set { |
@@ -290,7 +285,7 @@ namespace OpenSim.Services.Interfaces | |||
290 | RegionSizeY = (int)ConvertFrom.RegionSizeY; | 285 | RegionSizeY = (int)ConvertFrom.RegionSizeY; |
291 | m_internalEndPoint = ConvertFrom.InternalEndPoint; | 286 | m_internalEndPoint = ConvertFrom.InternalEndPoint; |
292 | m_externalHostName = ConvertFrom.ExternalHostName; | 287 | m_externalHostName = ConvertFrom.ExternalHostName; |
293 | m_httpPort = ConvertFrom.HttpPort; | 288 | HttpPort = ConvertFrom.HttpPort; |
294 | RegionID = ConvertFrom.RegionID; | 289 | RegionID = ConvertFrom.RegionID; |
295 | ServerURI = ConvertFrom.ServerURI; | 290 | ServerURI = ConvertFrom.ServerURI; |
296 | TerrainImage = ConvertFrom.RegionSettings.TerrainImageID; | 291 | TerrainImage = ConvertFrom.RegionSettings.TerrainImageID; |
@@ -310,7 +305,7 @@ namespace OpenSim.Services.Interfaces | |||
310 | RegionSizeY = ConvertFrom.RegionSizeY; | 305 | RegionSizeY = ConvertFrom.RegionSizeY; |
311 | m_internalEndPoint = ConvertFrom.InternalEndPoint; | 306 | m_internalEndPoint = ConvertFrom.InternalEndPoint; |
312 | m_externalHostName = ConvertFrom.ExternalHostName; | 307 | m_externalHostName = ConvertFrom.ExternalHostName; |
313 | m_httpPort = ConvertFrom.HttpPort; | 308 | HttpPort = ConvertFrom.HttpPort; |
314 | RegionID = ConvertFrom.RegionID; | 309 | RegionID = ConvertFrom.RegionID; |
315 | ServerURI = ConvertFrom.ServerURI; | 310 | ServerURI = ConvertFrom.ServerURI; |
316 | TerrainImage = ConvertFrom.TerrainImage; | 311 | TerrainImage = ConvertFrom.TerrainImage; |