ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Converted the LSL scripting engine into a IRegionModule, so now all "modules" share a common base interface and are loaded from the single loader. (It seems to work fine, but I have left the old scriptengine loader, incase we have to change back).

Browse Source 
Removed the reference to OpenJpeg in the DynamicTextureModule, to see if that was causing the build problem someone is having. 
Added a Temporary fix for the "existing connection was forcibly closed by the remote host" exception on windows when a user logs out of a multiregion instance. 
Some early work to prepare for improving the way clients are updated (about prims etc).
This commit is contained in:
MW
2007-09-08 07:50:31 +00:00
parent 294572d7bb
commit c29df824c2
14 changed files with 295 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,8 +191,8 @@ namespace OpenSim
MainLog.Instance.Verbose("Loading Shared Modules");
m_moduleLoader.LoadDefaultSharedModules(m_exceptSharedModules);
// Load all script engines found
OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader ScriptEngineLoader = new OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader(m_log);
// Load all script engines found (scripting engine is now a IRegionModule so loaded in the module loader
// OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader ScriptEngineLoader = new OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader(m_log);
for (int i = 0; i < configFiles.Length; i++)
{
@@ -209,11 +209,11 @@ namespace OpenSim
scene.SetModuleInterfaces();
// Check if we have a script engine to load
if (m_scriptEngine != null && m_scriptEngine != "")
{
OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine = ScriptEngineLoader.LoadScriptEngine(m_scriptEngine);
scene.AddScriptEngine(ScriptEngine, m_log);
}
//if (m_scriptEngine != null && m_scriptEngine != "")
//{
// OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine = ScriptEngineLoader.LoadScriptEngine(m_scriptEngine);
// scene.AddScriptEngine(ScriptEngine, m_log);
//}
//Server side object editing permissions checking
if (m_permissions)
@@ -371,7 +371,7 @@ namespace OpenSim
/// <param name="cmdparams">Additional arguments passed to the command</param>
public void RunCmd(string command, string[] cmdparams)
{
if ((m_consoleRegion == null) || (command == "change-region") || (command == "shutdown"))
if ((m_consoleRegion == null) || (command == "change-region") || (command == "shutdown"))
{
switch (command)
{
@@ -603,7 +603,7 @@ namespace OpenSim
string result = "";
for (int i = pos; i < commandParams.Length; i++)
{
result += commandParams[i] +" ";
result += commandParams[i] + " ";
}
result = result.TrimEnd(' ');
return result;