aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMainConsole.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-09 13:21:12 +0000
committerJustin Clarke Casey2008-05-09 13:21:12 +0000
commit313a635d1ec368b14a1678bdf7813138972f3bbc (patch)
tree9bbe16ca9d6be132ba38eb2e966ae87d616063ee /OpenSim/Region/Application/OpenSimMainConsole.cs
parent* Valid Sculpted prim now collide properly. (diff)
downloadopensim-SC-313a635d1ec368b14a1678bdf7813138972f3bbc.zip
opensim-SC-313a635d1ec368b14a1678bdf7813138972f3bbc.tar.gz
opensim-SC-313a635d1ec368b14a1678bdf7813138972f3bbc.tar.bz2
opensim-SC-313a635d1ec368b14a1678bdf7813138972f3bbc.tar.xz
* Fix opensim region server shutdown.
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMainConsole.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimMainConsole.cs26
1 files changed, 0 insertions, 26 deletions
diff --git a/OpenSim/Region/Application/OpenSimMainConsole.cs b/OpenSim/Region/Application/OpenSimMainConsole.cs
index c02095c..f33441f 100644
--- a/OpenSim/Region/Application/OpenSimMainConsole.cs
+++ b/OpenSim/Region/Application/OpenSimMainConsole.cs
@@ -120,32 +120,6 @@ namespace OpenSim
120 return new ConsoleBase("Region", this); 120 return new ConsoleBase("Region", this);
121 } 121 }
122 122
123 /// <summary>
124 /// Performs any last-minute sanity checking and shuts down the region server
125 /// </summary>
126 public override void Shutdown()
127 {
128 if (m_startupCommandsFile != String.Empty)
129 {
130 RunCommandScript(m_shutdownCommandsFile);
131 }
132
133 if (proxyUrl.Length > 0)
134 {
135 Util.XmlRpcCommand(proxyUrl, "Stop");
136 }
137
138 m_log.Info("[SHUTDOWN]: Closing all threads");
139 m_log.Info("[SHUTDOWN]: Killing listener thread");
140 m_log.Info("[SHUTDOWN]: Killing clients");
141 // TODO: implement this
142 m_log.Info("[SHUTDOWN]: Closing console and terminating");
143
144 m_sceneManager.Close();
145
146 base.Shutdown();
147 }
148
149 private void RunAutoTimerScript(object sender, EventArgs e) 123 private void RunAutoTimerScript(object sender, EventArgs e)
150 { 124 {
151 if (m_timedScript != "disabled") 125 if (m_timedScript != "disabled")