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

Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
This commit is contained in:
Melanie Thielker
2014-06-21 00:39:55 +02:00
parent 527c2cdb1e c6e9db5866
commit 159fcbf150
663 changed files with 89998 additions and 46619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Server/Base/Properties/AssemblyInfo.cs
View File

@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("0.7.6.*")]
[assembly: AssemblyVersion("0.8.0.*")]

1
OpenSim/Server/Base/ServerUtils.cs
View File

@@ -286,6 +286,7 @@ namespace OpenSim.Server.Base
e.InnerException == null ? e.Message : e.InnerException.Message,
e.StackTrace);
}
m_log.ErrorFormat("[SERVER UTILS]: Error loading plugin {0}: {1} args.Length {2}", dllName, e.Message, args.Length);
return null;
}

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

@@ -34,6 +34,7 @@ using System.Text;
using System.Xml;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Framework.Monitoring;
using OpenSim.Framework.Servers;
using log4net;
using log4net.Config;
@@ -171,11 +172,6 @@ namespace OpenSim.Server.Base
m_console = MainConsole.Instance;
// Configure the appenders for log4net
//
OpenSimAppender consoleAppender = null;
FileAppender fileAppender = null;
if (logConfig != null)
{
FileInfo cfg = new FileInfo(logConfig);
@@ -195,16 +191,7 @@ namespace OpenSim.Server.Base
}
RegisterCommonCommands();
// Register the quit command
//
MainConsole.Instance.Commands.AddCommand("General", false, "quit",
"quit",
"Quit the application", HandleQuit);
MainConsole.Instance.Commands.AddCommand("General", false, "shutdown",
"shutdown",
"Quit the application", HandleQuit);
RegisterCommonComponents(Config);
// Allow derived classes to perform initialization that
// needs to be done after the console has opened
@@ -219,6 +206,9 @@ namespace OpenSim.Server.Base
public virtual int Run()
{
Watchdog.Enabled = true;
MemoryWatchdog.Enabled = true;
while (m_Running)
{
try
@@ -236,11 +226,12 @@ namespace OpenSim.Server.Base
return 0;
}
protected virtual void HandleQuit(string module, string[] args)
protected override void ShutdownSpecific()
{
m_Running = false;
m_log.Info("[CONSOLE] Quitting");
base.ShutdownSpecific();
}
protected virtual void ReadConfig()
@@ -251,4 +242,4 @@ namespace OpenSim.Server.Base
{
}
}
}
}