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

This changeset is the step 1 of 2 in refactoring

Browse Source 
OpenSim.Region.Environment into a "framework" part and a modules only
part. This first changeset refactors OpenSim.Region.Environment.Scenes,
OpenSim.Region.Environment.Interfaces, and OpenSim.Region.Interfaces
into OpenSim.Region.Framework.{Interfaces,Scenes} leaving only region
modules in OpenSim.Region.Environment.

The next step will be to move region modules up from
OpenSim.Region.Environment.Modules to OpenSim.Region.CoreModules and
then sort out which modules are really core modules and which should
move out to forge.

I've been very careful to NOT BREAK anything. i hope i've
succeeded. as this is the work of a whole week i hope i managed to
keep track with the applied patches of the last week --- could any of
you that did check in stuff have a look at whether it survived? thx!
This commit is contained in:
Dr Scofield
2009-02-06 16:55:34 +00:00
parent 3bc6eb1ff0
commit 9b66108081
327 changed files with 1102 additions and 919 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs
View File

@@ -31,10 +31,9 @@ using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney;
using OpenSim.Region.Environment;
using OpenSim.Region.Interfaces;
using OpenSim.Region;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.ScriptEngine.Shared;
namespace OpenSim.Region.ScriptEngine.DotNetEngine

4
OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
View File

@@ -35,8 +35,8 @@ using System.Globalization;
using OpenMetaverse;
using log4net;
using OpenSim.Framework;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Environment.Scenes.Scripting;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Scenes.Scripting;
using OpenSim.Region.ScriptEngine.Shared;
using OpenSim.Region.ScriptEngine.Shared.CodeTools;

5
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
View File

@@ -30,11 +30,10 @@ using System.Collections.Generic;
using System.Reflection;
using log4net;
using Nini.Config;
using OpenSim.Region.Interfaces;
using OpenSim.Framework;
using OpenSim.Region.Environment;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.ScriptEngine.Interfaces;
using OpenMetaverse;
using OpenMetaverse.StructuredData;

2
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
View File

@@ -33,7 +33,7 @@ using System.Runtime.Remoting.Lifetime;
using log4net;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.ScriptEngine.Interfaces;
using OpenSim.Region.ScriptEngine.Shared;
using OpenSim.Region.ScriptEngine.Shared.Api;

2
OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
View File

@@ -27,7 +27,7 @@
using System;
using OpenMetaverse;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.ScriptEngine.Interfaces

2
OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
View File

@@ -28,7 +28,7 @@
using log4net;
using System;
using OpenSim.Region.ScriptEngine.Shared;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Framework.Scenes;
using OpenMetaverse;
using Nini.Config;
using OpenSim.Region.ScriptEngine.Interfaces;

6
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
View File

@@ -31,7 +31,7 @@ using System.Collections.Generic;
using System.Threading;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.ScriptEngine.Interfaces;
using OpenSim.Region.ScriptEngine.Shared;
using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
@@ -234,8 +234,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_Timer[engine].UnSetTimerEvents(localID, itemID);
// Remove from: HttpRequest
IHttpRequests iHttpReq =
engine.World.RequestModuleInterface<IHttpRequests>();
IHttpRequestModule iHttpReq =
engine.World.RequestModuleInterface<IHttpRequestModule>();
iHttpReq.StopHttpRequest(localID, itemID);
IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>();

9
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -38,12 +38,11 @@ using OpenSim;
using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Environment;
using OpenSim.Region.Interfaces;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney;
using OpenSim.Region.Environment.Modules.World.Land;
using OpenSim.Region.Environment.Modules.World.Terrain;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Physics.Manager;
using OpenSim.Region.ScriptEngine.Shared;
using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
@@ -8454,8 +8453,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// in StartHttpRequest
m_host.AddScriptLPS(1);
IHttpRequests httpScriptMod =
m_ScriptEngine.World.RequestModuleInterface<IHttpRequests>();
IHttpRequestModule httpScriptMod =
m_ScriptEngine.World.RequestModuleInterface<IHttpRequestModule>();
List<string> param = new List<string>();
foreach (object o in parameters.Data)
{

4
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@@ -35,8 +35,8 @@ using Nini.Config;
using OpenSim;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.ScriptEngine.Shared;
using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
using OpenSim.Region.ScriptEngine.Shared.ScriptBase;

20
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs
View File

@@ -26,7 +26,7 @@
*/
using System;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Modules.Scripting.HttpRequest;
using OpenSim.Region.ScriptEngine.Shared;
using OpenSim.Region.ScriptEngine.Interfaces;
@@ -48,13 +48,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
if (m_CmdManager.m_ScriptEngine.World == null)
return;
IHttpRequests iHttpReq =
m_CmdManager.m_ScriptEngine.World.RequestModuleInterface<IHttpRequests>();
IHttpRequestModule iHttpReq =
m_CmdManager.m_ScriptEngine.World.RequestModuleInterface<IHttpRequestModule>();
HttpRequestClass httpInfo = null;
if (iHttpReq != null)
httpInfo = iHttpReq.GetNextCompletedRequest();
httpInfo = (HttpRequestClass)iHttpReq.GetNextCompletedRequest();
while (httpInfo != null)
{
@@ -67,24 +67,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
// implemented here yet anyway. Should be fixed if/when maxsize
// is supported
iHttpReq.RemoveCompletedRequest(httpInfo.reqID);
iHttpReq.RemoveCompletedRequest(httpInfo.ReqID);
object[] resobj = new object[]
{
new LSL_Types.LSLString(httpInfo.reqID.ToString()),
new LSL_Types.LSLInteger(httpInfo.status),
new LSL_Types.LSLString(httpInfo.ReqID.ToString()),
new LSL_Types.LSLInteger(httpInfo.Status),
new LSL_Types.list(),
new LSL_Types.LSLString(httpInfo.response_body)
new LSL_Types.LSLString(httpInfo.ResponseBody)
};
foreach (IScriptEngine e in m_CmdManager.ScriptEngines)
{
if (e.PostObjectEvent(httpInfo.localID,
if (e.PostObjectEvent(httpInfo.LocalID,
new EventParams("http_response",
resobj, new DetectParams[0])))
break;
}
httpInfo = iHttpReq.GetNextCompletedRequest();
httpInfo = (HttpRequestClass)iHttpReq.GetNextCompletedRequest();
}
}
}

4
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs
View File

@@ -27,7 +27,7 @@
using System;
using OpenMetaverse;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Modules.Scripting.WorldComm;
using OpenSim.Region.ScriptEngine.Interfaces;
using OpenSim.Region.ScriptEngine.Shared;
@@ -56,7 +56,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
{
while (comms.HasMessages())
{
ListenerInfo lInfo = comms.GetNextMessage();
ListenerInfo lInfo = (ListenerInfo)comms.GetNextMessage();
//Deliver data to prim's listen handler
object[] resobj = new object[]

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
View File

@@ -30,7 +30,7 @@ using System.Collections.Generic;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.ScriptEngine.Shared;
using OpenSim.Region.ScriptEngine.Shared.Api;

18
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs
View File

@@ -26,7 +26,7 @@
*/
using System;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
using OpenSim.Region.ScriptEngine.Interfaces;
using OpenSim.Region.ScriptEngine.Shared;
@@ -52,7 +52,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
if (xmlrpc != null)
{
RPCRequestInfo rInfo = xmlrpc.GetNextCompletedRequest();
RPCRequestInfo rInfo = (RPCRequestInfo)xmlrpc.GetNextCompletedRequest();
while (rInfo != null)
{
@@ -80,10 +80,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
break;
}
rInfo = xmlrpc.GetNextCompletedRequest();
rInfo = (RPCRequestInfo)xmlrpc.GetNextCompletedRequest();
}
SendRemoteDataRequest srdInfo = xmlrpc.GetNextCompletedSRDRequest();
SendRemoteDataRequest srdInfo = (SendRemoteDataRequest)xmlrpc.GetNextCompletedSRDRequest();
while (srdInfo != null)
{
@@ -93,23 +93,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
object[] resobj = new object[]
{
new LSL_Types.LSLInteger(3),
new LSL_Types.LSLString(srdInfo.channel.ToString()),
new LSL_Types.LSLString(srdInfo.Channel.ToString()),
new LSL_Types.LSLString(srdInfo.GetReqID().ToString()),
new LSL_Types.LSLString(String.Empty),
new LSL_Types.LSLInteger(srdInfo.idata),
new LSL_Types.LSLString(srdInfo.sdata)
new LSL_Types.LSLInteger(srdInfo.Idata),
new LSL_Types.LSLString(srdInfo.Sdata)
};
foreach (IScriptEngine e in m_CmdManager.ScriptEngines)
{
if (e.PostScriptEvent(
srdInfo.m_itemID, new EventParams(
srdInfo.ItemID, new EventParams(
"remote_data", resobj,
new DetectParams[0])))
break;
}
srdInfo = xmlrpc.GetNextCompletedSRDRequest();
srdInfo = (SendRemoteDataRequest)xmlrpc.GetNextCompletedSRDRequest();
}
}
}

2
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
View File

@@ -31,7 +31,7 @@ using System.Threading;
using System.Reflection;
using System.Collections;
using System.Collections.Generic;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.ScriptEngine.Interfaces;
using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
using integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;

1
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp
View File

@@ -34,6 +34,7 @@
<ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Communications" />
<ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Console" />
<ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.Environment" />
<ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.Framework" />
<ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.ScriptEngine.Shared" />
<ProjectReference type="Assembly" refto="../../../../../../bin/RAIL.dll" localcopy="False" />
<ProjectReference type="Gac" localcopy="False" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />

2
OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
View File

@@ -33,7 +33,7 @@ using System.IO;
using Microsoft.CSharp;
using Microsoft.JScript;
using Microsoft.VisualBasic;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.ScriptEngine.Interfaces;
namespace OpenSim.Region.ScriptEngine.Shared.CodeTools

2
OpenSim/Region/ScriptEngine/Shared/Helpers.cs
View File

@@ -34,7 +34,7 @@ using System.Runtime.Serialization;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Environment;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Region.ScriptEngine.Shared
{

4
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@@ -42,8 +42,8 @@ using Nini.Config;
using Amib.Threading;
using OpenSim.Framework;
using OpenSim.Region.Environment;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.ScriptEngine.Shared;
using OpenSim.Region.ScriptEngine.Shared.Api;
using OpenSim.Region.ScriptEngine.Shared.Api.Runtime;

4
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs
View File

@@ -40,8 +40,8 @@ using Nini.Config;
using Amib.Threading;
using OpenSim.Framework;
using OpenSim.Region.Environment;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.ScriptEngine.Shared;
using OpenSim.Region.ScriptEngine.Shared.Api;
using OpenSim.Region.ScriptEngine.Shared.ScriptBase;

5
OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
View File

@@ -31,9 +31,8 @@ using System.Collections.Generic;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney;
using OpenSim.Region.Interfaces;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.ScriptEngine.Shared;
using OpenSim.Region.ScriptEngine.Interfaces;

5
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@@ -41,10 +41,9 @@ using log4net;
using Nini.Config;
using Amib.Threading;
using OpenSim.Framework;
using OpenSim.Region.Interfaces;
using OpenSim.Region.Environment;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.ScriptEngine.Shared;
using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
using OpenSim.Region.ScriptEngine.Shared.CodeTools;