diff options
author | Melanie Thielker | 2009-02-07 12:25:39 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-02-07 12:25:39 +0000 |
commit | 54c6a920baa0ef02a9ea09e08cc1effcef3b0a3a (patch) | |
tree | f606cbdbc383ec21fee28f0a1454140a1c714278 /OpenSim/Region/Application/Application.cs | |
parent | Thank you dslake for a patch that: (diff) | |
download | opensim-SC_OLD-54c6a920baa0ef02a9ea09e08cc1effcef3b0a3a.zip opensim-SC_OLD-54c6a920baa0ef02a9ea09e08cc1effcef3b0a3a.tar.gz opensim-SC_OLD-54c6a920baa0ef02a9ea09e08cc1effcef3b0a3a.tar.bz2 opensim-SC_OLD-54c6a920baa0ef02a9ea09e08cc1effcef3b0a3a.tar.xz |
Replace the console for all OpenSim apps with a new console featuring command
line editing, context sensitive help (press ? at any time), command line
history, a new plugin command system and new appender features thet let you
type while the console is scrolling. Seamlessly integrates the ICommander
interfaces.
Diffstat (limited to 'OpenSim/Region/Application/Application.cs')
-rw-r--r-- | OpenSim/Region/Application/Application.cs | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index a8e1499..7a427dc 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
@@ -34,6 +34,7 @@ using log4net.Config; | |||
34 | using Nini.Config; | 34 | using Nini.Config; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Console; | 36 | using OpenSim.Framework.Console; |
37 | using OpenSim.Region.Framework.Scenes; | ||
37 | 38 | ||
38 | namespace OpenSim | 39 | namespace OpenSim |
39 | { | 40 | { |
@@ -46,6 +47,8 @@ namespace OpenSim | |||
46 | public static bool m_saveCrashDumps = false; | 47 | public static bool m_saveCrashDumps = false; |
47 | public static string m_crashDir = "crashes"; | 48 | public static string m_crashDir = "crashes"; |
48 | 49 | ||
50 | protected static OpenSimBase m_sim = null; | ||
51 | |||
49 | //could move our main function into OpenSimMain and kill this class | 52 | //could move our main function into OpenSimMain and kill this class |
50 | public static void Main(string[] args) | 53 | public static void Main(string[] args) |
51 | { | 54 | { |
@@ -93,18 +96,18 @@ namespace OpenSim | |||
93 | 96 | ||
94 | if (background) | 97 | if (background) |
95 | { | 98 | { |
96 | OpenSimBase sim = new OpenSimBackground(configSource); | 99 | m_sim = new OpenSimBackground(configSource); |
97 | sim.Startup(); | 100 | m_sim.Startup(); |
98 | } | 101 | } |
99 | else | 102 | else |
100 | { | 103 | { |
101 | OpenSimBase sim = null; | 104 | m_sim = null; |
102 | if (hgrid) | 105 | if (hgrid) |
103 | sim = new HGOpenSimNode(configSource); | 106 | m_sim = new HGOpenSimNode(configSource); |
104 | else | 107 | else |
105 | sim = new OpenSim(configSource); | 108 | m_sim = new OpenSim(configSource); |
106 | 109 | ||
107 | sim.Startup(); | 110 | m_sim.Startup(); |
108 | 111 | ||
109 | while (true) | 112 | while (true) |
110 | { | 113 | { |