diff options
| author | onefang | 2021-08-26 06:21:19 +1000 |
|---|---|---|
| committer | onefang | 2021-08-26 06:21:19 +1000 |
| commit | cdfbb899f1112dab44d5490838765e9bd73bc60e (patch) | |
| tree | 52cddd0b76e7ad8544a0ada533f91bb5fc402025 /OpenSim/Framework/Console/CommandConsole.cs | |
| parent | Still failing to reconnect for dbCount(), just set the fucking timeout to a y... (diff) | |
| parent | Don't strip (OWNER) out of script error report. (diff) | |
| download | opensim-SC-cdfbb899f1112dab44d5490838765e9bd73bc60e.zip opensim-SC-cdfbb899f1112dab44d5490838765e9bd73bc60e.tar.gz opensim-SC-cdfbb899f1112dab44d5490838765e9bd73bc60e.tar.bz2 opensim-SC-cdfbb899f1112dab44d5490838765e9bd73bc60e.tar.xz | |
Merge branch 'switch' into Domme.
Diffstat (limited to 'OpenSim/Framework/Console/CommandConsole.cs')
| -rw-r--r-- | OpenSim/Framework/Console/CommandConsole.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs index 52360b4..d2b6618 100644 --- 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 | } |