aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index c125b99..c4c0eb4 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -237,7 +237,7 @@ namespace OpenSim
237 config.Set("enabled", "false"); 237 config.Set("enabled", "false");
238 } 238 }
239 239
240 if (DefaultConfig.Configs["Voice"] == null) 240 if (DefaultConfig.Configs["Voice"] == null)
241 DefaultConfig.AddConfig("Voice"); 241 DefaultConfig.AddConfig("Voice");
242 config = DefaultConfig.Configs["Voice"]; 242 config = DefaultConfig.Configs["Voice"];
243 if (config != null) 243 if (config != null)
@@ -332,7 +332,6 @@ namespace OpenSim
332 m_log.Info("[OPENSIM MAIN]: Shutdown complete, goodbye."); 332 m_log.Info("[OPENSIM MAIN]: Shutdown complete, goodbye.");
333 Environment.Exit(0); 333 Environment.Exit(0);
334 } 334 }
335
336 335
337 /// <summary> 336 /// <summary>
338 /// Signal that the end of the world is now. 337 /// Signal that the end of the world is now.
@@ -415,7 +414,6 @@ namespace OpenSim
415 //{ 414 //{
416 // m_udpServers[i].ServerListener(); 415 // m_udpServers[i].ServerListener();
417 // } 416 // }
418
419 } 417 }
420 418
421 protected override void Initialize() 419 protected override void Initialize()
@@ -454,7 +452,8 @@ namespace OpenSim
454 /// <param name="regionInfo"></param> 452 /// <param name="regionInfo"></param>
455 /// <param name="portadd_flag"></param> 453 /// <param name="portadd_flag"></param>
456 /// <returns></returns> 454 /// <returns></returns>
457 public UDPServer CreateRegion(RegionInfo regionInfo, bool portadd_flag) { 455 public UDPServer CreateRegion(RegionInfo regionInfo, bool portadd_flag)
456 {
458 return CreateRegion(regionInfo, portadd_flag, false); 457 return CreateRegion(regionInfo, portadd_flag, false);
459 } 458 }
460 459
@@ -464,7 +463,8 @@ namespace OpenSim
464 /// <param name="regionInfo"></param> 463 /// <param name="regionInfo"></param>
465 /// <param name="portadd_flag"></param> 464 /// <param name="portadd_flag"></param>
466 /// <returns></returns> 465 /// <returns></returns>
467 public UDPServer CreateRegion(RegionInfo regionInfo) { 466 public UDPServer CreateRegion(RegionInfo regionInfo)
467 {
468 return CreateRegion(regionInfo, false, true); 468 return CreateRegion(regionInfo, false, true);
469 } 469 }
470 470
@@ -702,9 +702,9 @@ namespace OpenSim
702 } 702 }
703 703
704 /// <summary> 704 /// <summary>
705 /// Get the number of the avatars in the Region server 705 /// Get the number of regions
706 /// </summary> 706 /// </summary>
707 /// <param name="usernum">The first out parameter describing the number of all the avatars in the Region server</param> 707 /// <param name="regionnum">The first out parameter describing the number of regions</param>
708 public void GetRegionNumber(out int regionnum) 708 public void GetRegionNumber(out int regionnum)
709 { 709 {
710 int accounter = 0; 710 int accounter = 0;