aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Console/CommandConsole.cs
diff options
context:
space:
mode:
authorMelanie2011-04-25 23:18:32 +0100
committerMelanie2011-04-25 23:18:32 +0100
commit9bf5e94b70c045e32e259f282c693c0fcea514a2 (patch)
tree71a6b6029d2cc74cf34fd5e09719f39f9f7a9422 /OpenSim/Framework/Console/CommandConsole.cs
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentMade things consistent between LocalInventoryServiceConnector and RemoteXInve... (diff)
downloadopensim-SC_OLD-9bf5e94b70c045e32e259f282c693c0fcea514a2.zip
opensim-SC_OLD-9bf5e94b70c045e32e259f282c693c0fcea514a2.tar.gz
opensim-SC_OLD-9bf5e94b70c045e32e259f282c693c0fcea514a2.tar.bz2
opensim-SC_OLD-9bf5e94b70c045e32e259f282c693c0fcea514a2.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/Console/CommandConsole.cs')
-rw-r--r--OpenSim/Framework/Console/CommandConsole.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index 52bcd55..be36cf2 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -592,9 +592,7 @@ namespace OpenSim.Framework.Console
592 string line = ReadLine(m_defaultPrompt + "# ", true, true); 592 string line = ReadLine(m_defaultPrompt + "# ", true, true);
593 593
594 if (line != String.Empty) 594 if (line != String.Empty)
595 { 595 Output("Invalid command");
596 m_log.Info("[CONSOLE] Invalid command");
597 }
598 } 596 }
599 597
600 public void RunCommand(string cmd) 598 public void RunCommand(string cmd)