diff options
* Optimized usings (the 'LL ate my scripts' commit)
* added some licensing info
Diffstat (limited to 'OpenSim/Framework/General/Types/RegionInfo.cs')
-rw-r--r-- | OpenSim/Framework/General/Types/RegionInfo.cs | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs index 7b99d06..4602dcf 100644 --- a/OpenSim/Framework/General/Types/RegionInfo.cs +++ b/OpenSim/Framework/General/Types/RegionInfo.cs | |||
@@ -26,14 +26,13 @@ | |||
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using System.Globalization; | 29 | using System.Globalization; |
30 | using System.Net; | ||
31 | using System.Net.Sockets; | ||
32 | using libsecondlife; | ||
33 | using OpenSim.Framework.Console; | ||
32 | using OpenSim.Framework.Interfaces; | 34 | using OpenSim.Framework.Interfaces; |
33 | using OpenSim.Framework.Utilities; | 35 | using OpenSim.Framework.Utilities; |
34 | using OpenSim.Framework.Console; | ||
35 | using libsecondlife; | ||
36 | using System.Net; | ||
37 | 36 | ||
38 | namespace OpenSim.Framework.Types | 37 | namespace OpenSim.Framework.Types |
39 | { | 38 | { |
@@ -65,7 +64,7 @@ namespace OpenSim.Framework.Types | |||
65 | if (ia == null) | 64 | if (ia == null) |
66 | ia = Adr; | 65 | ia = Adr; |
67 | 66 | ||
68 | if (Adr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) | 67 | if (Adr.AddressFamily == AddressFamily.InterNetwork) |
69 | { | 68 | { |
70 | ia = Adr; | 69 | ia = Adr; |
71 | break; | 70 | break; |
@@ -170,7 +169,7 @@ namespace OpenSim.Framework.Types | |||
170 | attri = configData.GetAttribute("SimLocationX"); | 169 | attri = configData.GetAttribute("SimLocationX"); |
171 | if (attri == "") | 170 | if (attri == "") |
172 | { | 171 | { |
173 | string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "1000"); | 172 | string location = MainLog.Instance.CmdPrompt("Grid Location X", "1000"); |
174 | configData.SetAttribute("SimLocationX", location); | 173 | configData.SetAttribute("SimLocationX", location); |
175 | m_regionLocX = (uint)Convert.ToUInt32(location); | 174 | m_regionLocX = (uint)Convert.ToUInt32(location); |
176 | } | 175 | } |
@@ -183,7 +182,7 @@ namespace OpenSim.Framework.Types | |||
183 | attri = configData.GetAttribute("SimLocationY"); | 182 | attri = configData.GetAttribute("SimLocationY"); |
184 | if (attri == "") | 183 | if (attri == "") |
185 | { | 184 | { |
186 | string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "1000"); | 185 | string location = MainLog.Instance.CmdPrompt("Grid Location Y", "1000"); |
187 | configData.SetAttribute("SimLocationY", location); | 186 | configData.SetAttribute("SimLocationY", location); |
188 | m_regionLocY = (uint)Convert.ToUInt32(location); | 187 | m_regionLocY = (uint)Convert.ToUInt32(location); |
189 | } | 188 | } |
@@ -209,7 +208,7 @@ namespace OpenSim.Framework.Types | |||
209 | attri = configData.GetAttribute("TerrainMultiplier"); | 208 | attri = configData.GetAttribute("TerrainMultiplier"); |
210 | if (attri == "") | 209 | if (attri == "") |
211 | { | 210 | { |
212 | string re = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0"); | 211 | string re = MainLog.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0"); |
213 | this.estateSettings.terrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture); | 212 | this.estateSettings.terrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture); |
214 | configData.SetAttribute("TerrainMultiplier", this.estateSettings.terrainMultiplier.ToString()); | 213 | configData.SetAttribute("TerrainMultiplier", this.estateSettings.terrainMultiplier.ToString()); |
215 | } | 214 | } |
@@ -222,7 +221,7 @@ namespace OpenSim.Framework.Types | |||
222 | attri = configData.GetAttribute("MasterAvatarFirstName"); | 221 | attri = configData.GetAttribute("MasterAvatarFirstName"); |
223 | if (attri == "") | 222 | if (attri == "") |
224 | { | 223 | { |
225 | this.MasterAvatarFirstName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("First name of Master Avatar (Land and Region Owner)", "Test"); | 224 | this.MasterAvatarFirstName = MainLog.Instance.CmdPrompt("First name of Master Avatar (Land and Region Owner)", "Test"); |
226 | 225 | ||
227 | configData.SetAttribute("MasterAvatarFirstName", this.MasterAvatarFirstName); | 226 | configData.SetAttribute("MasterAvatarFirstName", this.MasterAvatarFirstName); |
228 | } | 227 | } |
@@ -235,7 +234,7 @@ namespace OpenSim.Framework.Types | |||
235 | attri = configData.GetAttribute("MasterAvatarLastName"); | 234 | attri = configData.GetAttribute("MasterAvatarLastName"); |
236 | if (attri == "") | 235 | if (attri == "") |
237 | { | 236 | { |
238 | this.MasterAvatarLastName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Last name of Master Avatar (Land and Region Owner)", "User"); | 237 | this.MasterAvatarLastName = MainLog.Instance.CmdPrompt("Last name of Master Avatar (Land and Region Owner)", "User"); |
239 | 238 | ||
240 | configData.SetAttribute("MasterAvatarLastName", this.MasterAvatarLastName); | 239 | configData.SetAttribute("MasterAvatarLastName", this.MasterAvatarLastName); |
241 | } | 240 | } |
@@ -250,7 +249,7 @@ namespace OpenSim.Framework.Types | |||
250 | attri = configData.GetAttribute("MasterAvatarSandboxPassword"); | 249 | attri = configData.GetAttribute("MasterAvatarSandboxPassword"); |
251 | if (attri == "") | 250 | if (attri == "") |
252 | { | 251 | { |
253 | this.MasterAvatarSandboxPassword = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Password of Master Avatar (Needed for sandbox mode account creation only)", "test"); | 252 | this.MasterAvatarSandboxPassword = MainLog.Instance.CmdPrompt("Password of Master Avatar (Needed for sandbox mode account creation only)", "test"); |
254 | 253 | ||
255 | //Should I store this? | 254 | //Should I store this? |
256 | configData.SetAttribute("MasterAvatarSandboxPassword", this.MasterAvatarSandboxPassword); | 255 | configData.SetAttribute("MasterAvatarSandboxPassword", this.MasterAvatarSandboxPassword); |
@@ -265,17 +264,17 @@ namespace OpenSim.Framework.Types | |||
265 | } | 264 | } |
266 | catch (Exception e) | 265 | catch (Exception e) |
267 | { | 266 | { |
268 | OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); | 267 | MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured"); |
269 | OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString()); | 268 | MainLog.Instance.Warn(e.ToString()); |
270 | } | 269 | } |
271 | 270 | ||
272 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Sim settings loaded:"); | 271 | MainLog.Instance.Verbose("Sim settings loaded:"); |
273 | OpenSim.Framework.Console.MainLog.Instance.Verbose("UUID: " + this.SimUUID.ToStringHyphenated()); | 272 | MainLog.Instance.Verbose("UUID: " + this.SimUUID.ToStringHyphenated()); |
274 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Name: " + this.RegionName); | 273 | MainLog.Instance.Verbose("Name: " + this.RegionName); |
275 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]"); | 274 | MainLog.Instance.Verbose("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]"); |
276 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Region Handle: " + this.RegionHandle.ToString()); | 275 | MainLog.Instance.Verbose("Region Handle: " + this.RegionHandle.ToString()); |
277 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Listening on IP end point: " + m_internalEndPoint.ToString() ); | 276 | MainLog.Instance.Verbose("Listening on IP end point: " + m_internalEndPoint.ToString() ); |
278 | OpenSim.Framework.Console.MainLog.Instance.Verbose("Sandbox Mode? " + isSandbox.ToString()); | 277 | MainLog.Instance.Verbose("Sandbox Mode? " + isSandbox.ToString()); |
279 | 278 | ||
280 | } | 279 | } |
281 | 280 | ||