OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Full .dll-name in config option for ScriptEngine. Loading only scriptengine specified in config. 

ScriptServer will still not start!
afrisby
Tedd Hansen 2008-01-02 15:58:33 +00:00
parent 459a4b0bb5
commit 198dea28ad
5 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Grid/ScriptServer/Application.cs
View File

@ -35,11 +35,12 @@ namespace OpenSim.Grid.ScriptServer
private static void Main(string[] args) private static void Main(string[] args)
{ {
AppDomain.CurrentDomain.UnhandledException +=
new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
// Application is starting // Application is starting
SE = new ScriptServerMain(); SE = new ScriptServerMain();
AppDomain.CurrentDomain.UnhandledException +=
new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
} }
private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)

1
OpenSim/Grid/ScriptServer/RemotingObject.cs
View File

@ -14,6 +14,7 @@ namespace OpenSim.Grid.ScriptServer
// NOTE! CURRENTLY JUST HARDWIRED DOTNETENGINE! // NOTE! CURRENTLY JUST HARDWIRED DOTNETENGINE!
public OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine ScriptEngine = new OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine(); public OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine ScriptEngine = new OpenSim.Region.ScriptEngine.DotNetEngine.ScriptEngine();
/// <summary> /// <summary>
/// Receives calls from remote grids. /// Receives calls from remote grids.
/// </summary> /// </summary>

1
OpenSim/Grid/ScriptServer/ScriptServerMain.cs
View File

@ -54,6 +54,7 @@ namespace OpenSim.Grid.ScriptServer
//ScriptEngines = new ScriptEngineManager(this, m_log); //ScriptEngines = new ScriptEngineManager(this, m_log);
m_RemotingServer = new RemotingServer(); m_RemotingServer = new RemotingServer();
m_RemotingServer.CreateServer(listenPort, "DotNetEngine"); m_RemotingServer.CreateServer(listenPort, "DotNetEngine");
System.Console.ReadLine();
} }
~ScriptServerMain() ~ScriptServerMain()

6
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -173,7 +173,7 @@ namespace OpenSim
config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3"); config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
config.Set("startup_console_commands_file", ""); config.Set("startup_console_commands_file", "");
config.Set("shutdown_console_commands_file", ""); config.Set("shutdown_console_commands_file", "");
config.Set("script_engine", "DotNetEngine"); config.Set("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
config.Set("asset_database", "sqlite"); config.Set("asset_database", "sqlite");
} }
@ -246,7 +246,7 @@ namespace OpenSim
m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", ""); m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", "");
m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", ""); m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", "");
m_scriptEngine = startupConfig.GetString("script_engine", "DotNetEngine"); m_scriptEngine = startupConfig.GetString("script_engine", "OpenSim.Region.ScriptEngine.DotNetEngine.dll");
m_assetStorage = startupConfig.GetString("asset_database", "sqlite"); m_assetStorage = startupConfig.GetString("asset_database", "sqlite");
@ -374,7 +374,7 @@ namespace OpenSim
m_moduleLoader.PickupModules(scene, "."); m_moduleLoader.PickupModules(scene, ".");
//m_moduleLoader.PickupModules(scene, "ScriptEngines"); //m_moduleLoader.PickupModules(scene, "ScriptEngines");
m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", "OpenSim.Region.ScriptEngine.DotNetEngine.dll"), scene); m_moduleLoader.LoadRegionModules(Path.Combine("ScriptEngines", m_scriptEngine), scene);
m_moduleLoader.InitialiseSharedModules(scene); m_moduleLoader.InitialiseSharedModules(scene);

6
bin/OpenSim.ini.example
View File

@ -41,6 +41,12 @@ asset_database = "sqlite"
verbose = true verbose = true
; ScriptEngine
script_engine = OpenSim.Region.ScriptEngine.DotNetEngine.dll
;Experimental remote ScriptServer plugin:
;script_engine = OpenSim.Region.ScriptEngine.RemoteEngine.dll
; if you would like to allow prim to be physical and move by physics with the physical checkbox in the client set this to true. ; if you would like to allow prim to be physical and move by physics with the physical checkbox in the client set this to true.
physical_prim = true physical_prim = true