ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bigmerge

Browse Source 
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
This commit is contained in:
Melanie
2011-11-03 00:06:14 +00:00
parent 52d8fa2d0f e746840226
commit 243acef917
15 changed files with 119 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Server/Base/ServicesServerBase.cs
View File

@@ -266,7 +266,14 @@ namespace OpenSim.Server.Base
{
while (m_Running)
{
MainConsole.Instance.Prompt();
try
{
MainConsole.Instance.Prompt();
}
catch (Exception e)
{
m_log.ErrorFormat("Command error: {0}", e);
}
}
if (m_pidFile != String.Empty)