aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorMelanie2009-11-30 14:16:42 +0000
committerMelanie2009-11-30 14:16:42 +0000
commit8bbb88ea4eb7f96a8b347a48d943a36dcad58193 (patch)
treef7ddc469fd46bdf0da096c2f6feb0878933753f5 /OpenSim/Server
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-8bbb88ea4eb7f96a8b347a48d943a36dcad58193.zip
opensim-SC_OLD-8bbb88ea4eb7f96a8b347a48d943a36dcad58193.tar.gz
opensim-SC_OLD-8bbb88ea4eb7f96a8b347a48d943a36dcad58193.tar.bz2
opensim-SC_OLD-8bbb88ea4eb7f96a8b347a48d943a36dcad58193.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 1d9eb0d..63ba673 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -226,6 +226,10 @@ namespace OpenSim.Server.Base
226 "quit", 226 "quit",
227 "Quit the application", HandleQuit); 227 "Quit the application", HandleQuit);
228 228
229 MainConsole.Instance.Commands.AddCommand("base", false, "shutdown",
230 "shutdown",
231 "Quit the application", HandleQuit);
232
229 // Allow derived classes to perform initialization that 233 // Allow derived classes to perform initialization that
230 // needs to be done after the console has opened 234 // needs to be done after the console has opened
231 // 235 //