aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSim.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs (renamed from OpenSim/Region/Application/OpenSimMainConsole.cs)9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimMainConsole.cs b/OpenSim/Region/Application/OpenSim.cs
index 467db14..1bed036 100644
--- a/OpenSim/Region/Application/OpenSimMainConsole.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -46,7 +46,10 @@ namespace OpenSim
46{ 46{
47 public delegate void ConsoleCommand(string[] comParams); 47 public delegate void ConsoleCommand(string[] comParams);
48 48
49 public class OpenSimMainConsole : OpenSimMain, conscmd_callback 49 /// <summary>
50 /// Interactive OpenSim region server
51 /// </summary>
52 public class OpenSim : OpenSimBase, conscmd_callback
50 { 53 {
51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 54 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52 55
@@ -56,8 +59,7 @@ namespace OpenSim
56 private string m_timedScript = "disabled"; 59 private string m_timedScript = "disabled";
57 private Timer m_scriptTimer; 60 private Timer m_scriptTimer;
58 61
59 public OpenSimMainConsole(IConfigSource configSource) 62 public OpenSim(IConfigSource configSource) : base(configSource)
60 : base(configSource)
61 { 63 {
62 } 64 }
63 65
@@ -620,7 +622,6 @@ namespace OpenSim
620 { 622 {
621 RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle); 623 RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle);
622 string regionName; 624 string regionName;
623 System.Net.EndPoint ep = null;
624 625
625 if (regionInfo == null) 626 if (regionInfo == null)
626 { 627 {