diff options
| author | Melanie | 2011-11-28 11:06:38 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-28 11:06:38 +0000 |
| commit | dc612d0f08ff8740c1942270f22eb79f0310c8fd (patch) | |
| tree | 4c621d499eecbc176c6eb28a4bad4f8f4872e7f5 /OpenSim/Framework/Console | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-dc612d0f08ff8740c1942270f22eb79f0310c8fd.zip opensim-SC_OLD-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.gz opensim-SC_OLD-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.bz2 opensim-SC_OLD-dc612d0f08ff8740c1942270f22eb79f0310c8fd.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to 'OpenSim/Framework/Console')
| -rw-r--r-- | OpenSim/Framework/Console/CommandConsole.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs index f10b857..a0d3541 100644 --- a/OpenSim/Framework/Console/CommandConsole.cs +++ b/OpenSim/Framework/Console/CommandConsole.cs | |||
| @@ -565,7 +565,7 @@ namespace OpenSim.Framework.Console | |||
| 565 | /// </summary> | 565 | /// </summary> |
| 566 | public class CommandConsole : ConsoleBase, ICommandConsole | 566 | public class CommandConsole : ConsoleBase, ICommandConsole |
| 567 | { | 567 | { |
| 568 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 568 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 569 | 569 | ||
| 570 | public ICommands Commands { get; private set; } | 570 | public ICommands Commands { get; private set; } |
| 571 | 571 | ||