diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs index 5196368..b3e3ac3 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/RegionConsoleModule.cs | |||
| @@ -58,7 +58,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 58 | { | 58 | { |
| 59 | // private static readonly ILog m_log = | 59 | // private static readonly ILog m_log = |
| 60 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 60 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 61 | 61 | ||
| 62 | private Scene m_scene; | 62 | private Scene m_scene; |
| 63 | private IEventQueue m_eventQueue; | 63 | private IEventQueue m_eventQueue; |
| 64 | private Commands m_commands = new Commands(); | 64 | private Commands m_commands = new Commands(); |
| @@ -155,7 +155,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 155 | 155 | ||
| 156 | SendConsoleOutput(agentID, reply); | 156 | SendConsoleOutput(agentID, reply); |
| 157 | } | 157 | } |
| 158 | 158 | ||
| 159 | public void AddCommand(string module, bool shared, string command, string help, string longhelp, CommandDelegate fn) | 159 | public void AddCommand(string module, bool shared, string command, string help, string longhelp, CommandDelegate fn) |
| 160 | { | 160 | { |
| 161 | m_commands.AddCommand(module, shared, command, help, longhelp, fn); | 161 | m_commands.AddCommand(module, shared, command, help, longhelp, fn); |