aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorMelanie2011-11-03 00:06:14 +0000
committerMelanie2011-11-03 00:06:14 +0000
commit243acef917e8e61b9feef4587b440a77737e016e (patch)
treeaf80394d32977c53b729a395037dd080c8ffe214 /OpenSim/Server
parentMerge branch 'master' into bigmerge (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-243acef917e8e61b9feef4587b440a77737e016e.zip
opensim-SC-243acef917e8e61b9feef4587b440a77737e016e.tar.gz
opensim-SC-243acef917e8e61b9feef4587b440a77737e016e.tar.bz2
opensim-SC-243acef917e8e61b9feef4587b440a77737e016e.tar.xz
Merge branch 'master' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 36e6665..aeba35f 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -266,7 +266,14 @@ namespace OpenSim.Server.Base
266 { 266 {
267 while (m_Running) 267 while (m_Running)
268 { 268 {
269 MainConsole.Instance.Prompt(); 269 try
270 {
271 MainConsole.Instance.Prompt();
272 }
273 catch (Exception e)
274 {
275 m_log.ErrorFormat("Command error: {0}", e);
276 }
270 } 277 }
271 278
272 if (m_pidFile != String.Empty) 279 if (m_pidFile != String.Empty)