diff options
author | Melanie Thielker | 2009-05-04 15:04:24 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-05-04 15:04:24 +0000 |
commit | f80ba373fa6c06eda6ed89de811cbd716d6b80f7 (patch) | |
tree | d6519a735b3f2e9360830aae38663466aab519b5 /OpenSim/Framework | |
parent | * Refactor: Simplify InventoryFolderImpl. No functional change. (diff) | |
download | opensim-SC_OLD-f80ba373fa6c06eda6ed89de811cbd716d6b80f7.zip opensim-SC_OLD-f80ba373fa6c06eda6ed89de811cbd716d6b80f7.tar.gz opensim-SC_OLD-f80ba373fa6c06eda6ed89de811cbd716d6b80f7.tar.bz2 opensim-SC_OLD-f80ba373fa6c06eda6ed89de811cbd716d6b80f7.tar.xz |
Prebuild changes to allow the console to reference the http server
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Console/RemoteConsole.cs | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs index f254300..71f075e 100644 --- a/OpenSim/Framework/Console/RemoteConsole.cs +++ b/OpenSim/Framework/Console/RemoteConsole.cs | |||
@@ -31,6 +31,8 @@ using System.Diagnostics; | |||
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using System.Text; | 32 | using System.Text; |
33 | using System.Threading; | 33 | using System.Threading; |
34 | using Nini.Config; | ||
35 | using OpenSim.Framework.Servers.Interfaces; | ||
34 | using log4net; | 36 | using log4net; |
35 | 37 | ||
36 | namespace OpenSim.Framework.Console | 38 | namespace OpenSim.Framework.Console |
@@ -41,10 +43,23 @@ namespace OpenSim.Framework.Console | |||
41 | { | 43 | { |
42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | 45 | ||
46 | private IHttpServer m_Server = null; | ||
47 | private IConfigSource m_Config = null; | ||
48 | |||
44 | public RemoteConsole(string defaultPrompt) : base(defaultPrompt) | 49 | public RemoteConsole(string defaultPrompt) : base(defaultPrompt) |
45 | { | 50 | { |
46 | } | 51 | } |
47 | 52 | ||
53 | public void ReadConfig(IConfigSource config) | ||
54 | { | ||
55 | m_Config = config; | ||
56 | } | ||
57 | |||
58 | public void SetServer(IHttpServer server) | ||
59 | { | ||
60 | m_Server = server; | ||
61 | } | ||
62 | |||
48 | public override void Output(string text) | 63 | public override void Output(string text) |
49 | { | 64 | { |
50 | } | 65 | } |