diff options
author | Melanie | 2019-08-21 21:23:54 +0100 |
---|---|---|
committer | Melanie | 2019-08-21 21:23:54 +0100 |
commit | 110644c23a8f6c2dedc4392c833101d369c58f3e (patch) | |
tree | 3cf78807d9e116fa3c1ec27ef8cee8f93cab2493 /OpenSim/Framework | |
parent | Call SetServer on consoles reflectively to avoid having type checks in places... (diff) | |
download | opensim-SC-110644c23a8f6c2dedc4392c833101d369c58f3e.zip opensim-SC-110644c23a8f6c2dedc4392c833101d369c58f3e.tar.gz opensim-SC-110644c23a8f6c2dedc4392c833101d369c58f3e.tar.bz2 opensim-SC-110644c23a8f6c2dedc4392c833101d369c58f3e.tar.xz |
Make ReadConfig a general features of consoles, rather than type dependent
Diffstat (limited to '')
-rwxr-xr-x[-rw-r--r--] | OpenSim/Framework/Console/CommandConsole.cs | 5 | ||||
-rwxr-xr-x | OpenSim/Framework/Console/MockConsole.cs | 3 | ||||
-rwxr-xr-x | OpenSim/Framework/Console/RemoteConsole.cs | 2 | ||||
-rwxr-xr-x | OpenSim/Framework/ICommandConsole.cs | 3 |
4 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs index 52360b4..d2b6618 100644..100755 --- a/OpenSim/Framework/Console/CommandConsole.cs +++ b/OpenSim/Framework/Console/CommandConsole.cs | |||
@@ -36,6 +36,7 @@ using System.Text.RegularExpressions; | |||
36 | using System.Threading; | 36 | using System.Threading; |
37 | using log4net; | 37 | using log4net; |
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
39 | using Nini.Config; | ||
39 | 40 | ||
40 | namespace OpenSim.Framework.Console | 41 | namespace OpenSim.Framework.Console |
41 | { | 42 | { |
@@ -789,5 +790,9 @@ namespace OpenSim.Framework.Console | |||
789 | } | 790 | } |
790 | return cmdinput; | 791 | return cmdinput; |
791 | } | 792 | } |
793 | |||
794 | public virtual void ReadConfig(IConfigSource configSource) | ||
795 | { | ||
796 | } | ||
792 | } | 797 | } |
793 | } | 798 | } |
diff --git a/OpenSim/Framework/Console/MockConsole.cs b/OpenSim/Framework/Console/MockConsole.cs index d68b066..6adc678 100755 --- a/OpenSim/Framework/Console/MockConsole.cs +++ b/OpenSim/Framework/Console/MockConsole.cs | |||
@@ -30,6 +30,7 @@ using System.Threading; | |||
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Text; | 31 | using System.Text; |
32 | using System.Xml; | 32 | using System.Xml; |
33 | using Nini.Config; | ||
33 | 34 | ||
34 | namespace OpenSim.Framework.Console | 35 | namespace OpenSim.Framework.Console |
35 | { | 36 | { |
@@ -69,6 +70,8 @@ namespace OpenSim.Framework.Console | |||
69 | public string Prompt(string prompt, string defaultresponse, List<string> options) { return ""; } | 70 | public string Prompt(string prompt, string defaultresponse, List<string> options) { return ""; } |
70 | 71 | ||
71 | public string PasswdPrompt(string p) { return ""; } | 72 | public string PasswdPrompt(string p) { return ""; } |
73 | |||
74 | public void ReadConfig(IConfigSource configSource) { } | ||
72 | } | 75 | } |
73 | 76 | ||
74 | public class MockCommands : ICommands | 77 | public class MockCommands : ICommands |
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs index 11006a9..8dc7333 100755 --- a/OpenSim/Framework/Console/RemoteConsole.cs +++ b/OpenSim/Framework/Console/RemoteConsole.cs | |||
@@ -155,7 +155,7 @@ namespace OpenSim.Framework.Console | |||
155 | m_expireTimer.Start(); | 155 | m_expireTimer.Start(); |
156 | } | 156 | } |
157 | 157 | ||
158 | public void ReadConfig(IConfigSource config) | 158 | public override void ReadConfig(IConfigSource config) |
159 | { | 159 | { |
160 | m_Config = config; | 160 | m_Config = config; |
161 | 161 | ||
diff --git a/OpenSim/Framework/ICommandConsole.cs b/OpenSim/Framework/ICommandConsole.cs index 3db2765..043056f 100755 --- a/OpenSim/Framework/ICommandConsole.cs +++ b/OpenSim/Framework/ICommandConsole.cs | |||
@@ -25,6 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using Nini.Config; | ||
28 | using System; | 29 | using System; |
29 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
30 | using System.Xml; | 31 | using System.Xml; |
@@ -102,5 +103,7 @@ namespace OpenSim.Framework | |||
102 | void RunCommand(string cmd); | 103 | void RunCommand(string cmd); |
103 | 104 | ||
104 | string ReadLine(string p, bool isCommand, bool e); | 105 | string ReadLine(string p, bool isCommand, bool e); |
106 | |||
107 | void ReadConfig(IConfigSource configSource); | ||
105 | } | 108 | } |
106 | } | 109 | } |