diff options
| author | lbsa71 | 2007-07-01 20:30:02 +0000 |
|---|---|---|
| committer | lbsa71 | 2007-07-01 20:30:02 +0000 |
| commit | 97d441fca4846818b8c67297fa0065cb3c8e989f (patch) | |
| tree | ba4f580ad3273bdb18d8f6d4784b0dfa877cb661 | |
| parent | Can change the name and description of a prim. (diff) | |
| download | opensim-SC-97d441fca4846818b8c67297fa0065cb3c8e989f.zip opensim-SC-97d441fca4846818b8c67297fa0065cb3c8e989f.tar.gz opensim-SC-97d441fca4846818b8c67297fa0065cb3c8e989f.tar.bz2 opensim-SC-97d441fca4846818b8c67297fa0065cb3c8e989f.tar.xz | |
* replaced some more of those butt-fuggly attr constructs with nice Get<> calls; somebody should finish the job.
| -rw-r--r-- | OpenSim/Framework/General/Types/RegionInfo.cs | 84 |
1 files changed, 4 insertions, 80 deletions
diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs index cbd8695..9cef2ba 100644 --- a/OpenSim/Framework/General/Types/RegionInfo.cs +++ b/OpenSim/Framework/General/Types/RegionInfo.cs | |||
| @@ -227,93 +227,17 @@ namespace OpenSim.Framework.Types | |||
| 227 | 227 | ||
| 228 | m_regionHandle = null; | 228 | m_regionHandle = null; |
| 229 | 229 | ||
| 230 | // Local storage datastore | 230 | this.DataStore = GetString(configData, "Datastore", "localworld.yap", "Filename for local storage"); |
| 231 | attri = ""; | 231 | |
| 232 | attri = configData.GetAttribute("Datastore"); | ||
| 233 | if (attri == "") | ||
| 234 | { | ||
| 235 | string datastore = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Filename for local storage", "localworld.yap"); | ||
| 236 | configData.SetAttribute("Datastore", datastore); | ||
| 237 | this.DataStore = datastore; | ||
| 238 | } | ||
| 239 | else | ||
| 240 | { | ||
| 241 | this.DataStore = attri; | ||
| 242 | } | ||
| 243 | |||
| 244 | IPAddress internalAddress = GetIPAddress(configData, "InternalIPAddress", "0.0.0.0", "Internal IP Address for UDP client connections"); | 232 | IPAddress internalAddress = GetIPAddress(configData, "InternalIPAddress", "0.0.0.0", "Internal IP Address for UDP client connections"); |
| 245 | int internalPort = GetIPPort(configData, "InternalIPPort", "9000", "Internal IP Port for UDP client connections"); | 233 | int internalPort = GetIPPort(configData, "InternalIPPort", "9000", "Internal IP Port for UDP client connections"); |
| 246 | m_internalEndPoint = new IPEndPoint(internalAddress, internalPort); | 234 | m_internalEndPoint = new IPEndPoint(internalAddress, internalPort); |
| 247 | 235 | ||
| 248 | m_externalHostName = GetString(configData, "ExternalHostName", "localhost", "External Host Name"); | 236 | m_externalHostName = GetString(configData, "ExternalHostName", "localhost", "External Host Name"); |
| 249 | |||
| 250 | 237 | ||
| 238 | estateSettings.terrainFile = | ||
| 239 | GetString(configData, "TerrainFile", "default.r32", "GENERAL SETTING: Default Terrain File"); | ||
| 251 | 240 | ||
| 252 | |||
| 253 | //Sim Listen Address | ||
| 254 | //attri = ""; | ||
| 255 | //attri = configData.GetAttribute("SimListenAddress"); | ||
| 256 | //if (attri == "") | ||
| 257 | //{ | ||
| 258 | // m_commsIPListenAddr = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("IP Address to listen on for client connections", "0.0.0.0"); | ||
| 259 | // configData.SetAttribute("SimListenAddress", CommsIPListenAddr); | ||
| 260 | //} | ||
| 261 | //else | ||
| 262 | //{ | ||
| 263 | // // Probably belongs elsewhere, but oh well. | ||
| 264 | // if (attri.Trim().StartsWith("SYSTEMIP")) | ||
| 265 | // { | ||
| 266 | // string localhostname = System.Net.Dns.GetHostName(); | ||
| 267 | // System.Net.IPAddress[] ips = System.Net.Dns.GetHostAddresses(localhostname); | ||
| 268 | // try | ||
| 269 | // { | ||
| 270 | // m_commsIPListenAddr = "0.0.0.0"; // Incase a IPv4 address isnt found | ||
| 271 | |||
| 272 | // foreach (System.Net.IPAddress ip in ips) | ||
| 273 | // { | ||
| 274 | // if (ip.AddressFamily.ToString() == System.Net.Sockets.ProtocolFamily.InterNetwork.ToString()) | ||
| 275 | // { | ||
| 276 | // m_commsIPListenAddr = ip.ToString(); | ||
| 277 | // break; | ||
| 278 | // } | ||
| 279 | // } | ||
| 280 | // } | ||
| 281 | // catch (Exception) | ||
| 282 | // { | ||
| 283 | // m_commsIPListenAddr = "0.0.0.0"; // Use the default if we fail | ||
| 284 | // } | ||
| 285 | // } | ||
| 286 | // else | ||
| 287 | // { | ||
| 288 | // m_commsIPListenAddr = attri; | ||
| 289 | // } | ||
| 290 | //} | ||
| 291 | |||
| 292 | //// Sim External Address | ||
| 293 | //attri = ""; | ||
| 294 | //attri = configData.GetAttribute("SimExternalAddress"); | ||
| 295 | //if (attri == "") | ||
| 296 | //{ | ||
| 297 | // m_commsExternalAddress = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("IP or DNS address to send external clients to", "localhost"); | ||
| 298 | // configData.SetAttribute("SimExternalAddress", CommsExternalAddress); | ||
| 299 | //} | ||
| 300 | //else | ||
| 301 | //{ | ||
| 302 | // m_commsExternalAddress = attri; | ||
| 303 | //} | ||
| 304 | |||
| 305 | attri = ""; | ||
| 306 | attri = configData.GetAttribute("TerrainFile"); | ||
| 307 | if (attri == "") | ||
| 308 | { | ||
| 309 | this.estateSettings.terrainFile = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("GENERAL SETTING: Default Terrain File", "default.r32"); | ||
| 310 | configData.SetAttribute("TerrainFile", this.estateSettings.terrainFile); | ||
| 311 | } | ||
| 312 | else | ||
| 313 | { | ||
| 314 | this.estateSettings.terrainFile = attri; | ||
| 315 | } | ||
| 316 | |||
| 317 | attri = ""; | 241 | attri = ""; |
| 318 | attri = configData.GetAttribute("TerrainMultiplier"); | 242 | attri = configData.GetAttribute("TerrainMultiplier"); |
| 319 | if (attri == "") | 243 | if (attri == "") |