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

* Rolled back a few changes.

Browse Source
This commit is contained in:
Adam Frisby
2008-05-01 18:04:42 +00:00
parent 138e612300
commit 20a9bf08f5
117 changed files with 5079 additions and 4982 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionBase.cs
View File

@@ -32,13 +32,8 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer.Region
// These are events that the region needs to have
// TEMP: Using System.Delegate -- needs replacing with a real delegate
#region Delegates
public delegate void DefaultDelegate();
#endregion
public event DefaultDelegate onScriptRez;
public event DefaultDelegate onstate_entry;
public event DefaultDelegate onstate_exit;

2
OpenSim/Grid/ScriptServer/ScriptServer/Region/RegionConnectionManager.cs
View File

@@ -29,8 +29,8 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer.Region
{
public class RegionConnectionManager : RegionBase
{
private object m_Connection;
private ScriptServerMain m_ScriptServerMain;
private object m_Connection;
public RegionConnectionManager(ScriptServerMain scm, object Connection)
{

6
OpenSim/Grid/ScriptServer/ScriptServer/RegionCommManager.cs
View File

@@ -34,10 +34,12 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer
{
internal class RegionCommManager
{
private readonly ScriptServerMain m_ScriptServerMain;
private readonly List<RegionConnectionManager> Regions = new List<RegionConnectionManager>();
private Thread listenThread;
private List<RegionConnectionManager> Regions = new List<RegionConnectionManager>();
private ScriptServerMain m_ScriptServerMain;
public RegionCommManager(ScriptServerMain scm)
{
m_ScriptServerMain = scm;

6
OpenSim/Grid/ScriptServer/ScriptServer/ScriptEngineLoader.cs
View File

@@ -51,7 +51,7 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer
{
m_log.Error("[ScriptEngine]: " +
"Error loading assembly \"" + EngineName + "\": " + e.Message + ", " +
e.StackTrace);
e.StackTrace.ToString());
}
return ret;
}
@@ -104,7 +104,7 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer
ScriptServerInterfaces.ScriptEngine ret;
//try
//{
ret = (ScriptServerInterfaces.ScriptEngine) Activator.CreateInstance(t);
ret = (ScriptServerInterfaces.ScriptEngine)Activator.CreateInstance(t);
//}
//catch (Exception e)
//{
@@ -114,4 +114,4 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer
return ret;
}
}
}
}

6
OpenSim/Grid/ScriptServer/ScriptServer/ScriptEnginesManager.cs
View File

@@ -32,8 +32,8 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer
{
internal class ScriptEngineManager
{
private readonly ScriptEngineLoader ScriptEngineLoader;
private readonly List<ScriptServerInterfaces.ScriptEngine> scriptEngines = new List<ScriptServerInterfaces.ScriptEngine>();
private ScriptEngineLoader ScriptEngineLoader;
private List<ScriptServerInterfaces.ScriptEngine> scriptEngines = new List<ScriptServerInterfaces.ScriptEngine>();
private ScriptServerMain m_ScriptServerMain;
// Initialize
@@ -58,4 +58,4 @@ namespace OpenSim.Grid.ScriptServer.ScriptServer
return sei;
}
}
}
}