diff options
Diffstat (limited to '')
21 files changed, 52 insertions, 56 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs index 09dbc40..7eb00a7 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventManager.cs | |||
@@ -31,10 +31,9 @@ using OpenMetaverse; | |||
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; | 32 | using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; |
33 | using OpenSim.Region.Environment; | 33 | using OpenSim.Region.Environment; |
34 | using OpenSim.Region.Interfaces; | ||
35 | using OpenSim.Region; | 34 | using OpenSim.Region; |
36 | using OpenSim.Region.Environment.Scenes; | 35 | using OpenSim.Region.Framework.Scenes; |
37 | using OpenSim.Region.Environment.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
38 | using OpenSim.Region.ScriptEngine.Shared; | 37 | using OpenSim.Region.ScriptEngine.Shared; |
39 | 38 | ||
40 | namespace OpenSim.Region.ScriptEngine.DotNetEngine | 39 | namespace OpenSim.Region.ScriptEngine.DotNetEngine |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs index 5ac57c2..01cbb72 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs | |||
@@ -35,8 +35,8 @@ using System.Globalization; | |||
35 | using OpenMetaverse; | 35 | using OpenMetaverse; |
36 | using log4net; | 36 | using log4net; |
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Region.Environment.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using OpenSim.Region.Environment.Scenes.Scripting; | 39 | using OpenSim.Region.Framework.Scenes.Scripting; |
40 | using OpenSim.Region.ScriptEngine.Shared; | 40 | using OpenSim.Region.ScriptEngine.Shared; |
41 | using OpenSim.Region.ScriptEngine.Shared.CodeTools; | 41 | using OpenSim.Region.ScriptEngine.Shared.CodeTools; |
42 | 42 | ||
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs index 28e1278..f1f5f4b 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs | |||
@@ -30,11 +30,10 @@ using System.Collections.Generic; | |||
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using log4net; | 31 | using log4net; |
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using OpenSim.Region.Interfaces; | ||
34 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
35 | using OpenSim.Region.Environment; | 34 | using OpenSim.Region.Environment; |
36 | using OpenSim.Region.Environment.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.Environment.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
38 | using OpenSim.Region.ScriptEngine.Interfaces; | 37 | using OpenSim.Region.ScriptEngine.Interfaces; |
39 | using OpenMetaverse; | 38 | using OpenMetaverse; |
40 | using OpenMetaverse.StructuredData; | 39 | using OpenMetaverse.StructuredData; |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index 2631867..3de3aad 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | |||
@@ -33,7 +33,7 @@ using System.Runtime.Remoting.Lifetime; | |||
33 | using log4net; | 33 | using log4net; |
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.Environment.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | using OpenSim.Region.ScriptEngine.Interfaces; | 37 | using OpenSim.Region.ScriptEngine.Interfaces; |
38 | using OpenSim.Region.ScriptEngine.Shared; | 38 | using OpenSim.Region.ScriptEngine.Shared; |
39 | using OpenSim.Region.ScriptEngine.Shared.Api; | 39 | using OpenSim.Region.ScriptEngine.Shared.Api; |
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs index e94de68..707a7f7 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | using OpenSim.Region.Environment.Scenes; | 30 | using OpenSim.Region.Framework.Scenes; |
31 | 31 | ||
32 | 32 | ||
33 | namespace OpenSim.Region.ScriptEngine.Interfaces | 33 | namespace OpenSim.Region.ScriptEngine.Interfaces |
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs index 04af705..84baa64 100644 --- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs +++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using log4net; | 28 | using log4net; |
29 | using System; | 29 | using System; |
30 | using OpenSim.Region.ScriptEngine.Shared; | 30 | using OpenSim.Region.ScriptEngine.Shared; |
31 | using OpenSim.Region.Environment.Scenes; | 31 | using OpenSim.Region.Framework.Scenes; |
32 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | using Nini.Config; | 33 | using Nini.Config; |
34 | using OpenSim.Region.ScriptEngine.Interfaces; | 34 | using OpenSim.Region.ScriptEngine.Interfaces; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs index 71a8d0f..cc71bab 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs | |||
@@ -31,7 +31,7 @@ using System.Collections.Generic; | |||
31 | using System.Threading; | 31 | using System.Threading; |
32 | using OpenMetaverse; | 32 | using OpenMetaverse; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Region.Environment.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
35 | using OpenSim.Region.ScriptEngine.Interfaces; | 35 | using OpenSim.Region.ScriptEngine.Interfaces; |
36 | using OpenSim.Region.ScriptEngine.Shared; | 36 | using OpenSim.Region.ScriptEngine.Shared; |
37 | using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; | 37 | using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; |
@@ -234,8 +234,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
234 | m_Timer[engine].UnSetTimerEvents(localID, itemID); | 234 | m_Timer[engine].UnSetTimerEvents(localID, itemID); |
235 | 235 | ||
236 | // Remove from: HttpRequest | 236 | // Remove from: HttpRequest |
237 | IHttpRequests iHttpReq = | 237 | IHttpRequestModule iHttpReq = |
238 | engine.World.RequestModuleInterface<IHttpRequests>(); | 238 | engine.World.RequestModuleInterface<IHttpRequestModule>(); |
239 | iHttpReq.StopHttpRequest(localID, itemID); | 239 | iHttpReq.StopHttpRequest(localID, itemID); |
240 | 240 | ||
241 | IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>(); | 241 | IWorldComm comms = engine.World.RequestModuleInterface<IWorldComm>(); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 7564c69..1484638 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -38,12 +38,11 @@ using OpenSim; | |||
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Communications.Cache; | 39 | using OpenSim.Framework.Communications.Cache; |
40 | using OpenSim.Region.Environment; | 40 | using OpenSim.Region.Environment; |
41 | using OpenSim.Region.Interfaces; | 41 | using OpenSim.Region.Framework.Interfaces; |
42 | using OpenSim.Region.Environment.Interfaces; | ||
43 | using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; | 42 | using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; |
44 | using OpenSim.Region.Environment.Modules.World.Land; | 43 | using OpenSim.Region.Environment.Modules.World.Land; |
45 | using OpenSim.Region.Environment.Modules.World.Terrain; | 44 | using OpenSim.Region.Environment.Modules.World.Terrain; |
46 | using OpenSim.Region.Environment.Scenes; | 45 | using OpenSim.Region.Framework.Scenes; |
47 | using OpenSim.Region.Physics.Manager; | 46 | using OpenSim.Region.Physics.Manager; |
48 | using OpenSim.Region.ScriptEngine.Shared; | 47 | using OpenSim.Region.ScriptEngine.Shared; |
49 | using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; | 48 | using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; |
@@ -8454,8 +8453,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8454 | // in StartHttpRequest | 8453 | // in StartHttpRequest |
8455 | 8454 | ||
8456 | m_host.AddScriptLPS(1); | 8455 | m_host.AddScriptLPS(1); |
8457 | IHttpRequests httpScriptMod = | 8456 | IHttpRequestModule httpScriptMod = |
8458 | m_ScriptEngine.World.RequestModuleInterface<IHttpRequests>(); | 8457 | m_ScriptEngine.World.RequestModuleInterface<IHttpRequestModule>(); |
8459 | List<string> param = new List<string>(); | 8458 | List<string> param = new List<string>(); |
8460 | foreach (object o in parameters.Data) | 8459 | foreach (object o in parameters.Data) |
8461 | { | 8460 | { |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 734b3ef..fa09b0a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -35,8 +35,8 @@ using Nini.Config; | |||
35 | using OpenSim; | 35 | using OpenSim; |
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Console; | 37 | using OpenSim.Framework.Console; |
38 | using OpenSim.Region.Environment.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
39 | using OpenSim.Region.Environment.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
40 | using OpenSim.Region.ScriptEngine.Shared; | 40 | using OpenSim.Region.ScriptEngine.Shared; |
41 | using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; | 41 | using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; |
42 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; | 42 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs index f5a965b..4c7dc8d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs | |||
@@ -26,7 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using OpenSim.Region.Environment.Interfaces; | 29 | using OpenSim.Region.Framework.Interfaces; |
30 | using OpenSim.Region.Environment.Modules.Scripting.HttpRequest; | 30 | using OpenSim.Region.Environment.Modules.Scripting.HttpRequest; |
31 | using OpenSim.Region.ScriptEngine.Shared; | 31 | using OpenSim.Region.ScriptEngine.Shared; |
32 | using OpenSim.Region.ScriptEngine.Interfaces; | 32 | using OpenSim.Region.ScriptEngine.Interfaces; |
@@ -48,13 +48,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
48 | if (m_CmdManager.m_ScriptEngine.World == null) | 48 | if (m_CmdManager.m_ScriptEngine.World == null) |
49 | return; | 49 | return; |
50 | 50 | ||
51 | IHttpRequests iHttpReq = | 51 | IHttpRequestModule iHttpReq = |
52 | m_CmdManager.m_ScriptEngine.World.RequestModuleInterface<IHttpRequests>(); | 52 | m_CmdManager.m_ScriptEngine.World.RequestModuleInterface<IHttpRequestModule>(); |
53 | 53 | ||
54 | HttpRequestClass httpInfo = null; | 54 | HttpRequestClass httpInfo = null; |
55 | 55 | ||
56 | if (iHttpReq != null) | 56 | if (iHttpReq != null) |
57 | httpInfo = iHttpReq.GetNextCompletedRequest(); | 57 | httpInfo = (HttpRequestClass)iHttpReq.GetNextCompletedRequest(); |
58 | 58 | ||
59 | while (httpInfo != null) | 59 | while (httpInfo != null) |
60 | { | 60 | { |
@@ -67,24 +67,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
67 | // implemented here yet anyway. Should be fixed if/when maxsize | 67 | // implemented here yet anyway. Should be fixed if/when maxsize |
68 | // is supported | 68 | // is supported |
69 | 69 | ||
70 | iHttpReq.RemoveCompletedRequest(httpInfo.reqID); | 70 | iHttpReq.RemoveCompletedRequest(httpInfo.ReqID); |
71 | 71 | ||
72 | object[] resobj = new object[] | 72 | object[] resobj = new object[] |
73 | { | 73 | { |
74 | new LSL_Types.LSLString(httpInfo.reqID.ToString()), | 74 | new LSL_Types.LSLString(httpInfo.ReqID.ToString()), |
75 | new LSL_Types.LSLInteger(httpInfo.status), | 75 | new LSL_Types.LSLInteger(httpInfo.Status), |
76 | new LSL_Types.list(), | 76 | new LSL_Types.list(), |
77 | new LSL_Types.LSLString(httpInfo.response_body) | 77 | new LSL_Types.LSLString(httpInfo.ResponseBody) |
78 | }; | 78 | }; |
79 | 79 | ||
80 | foreach (IScriptEngine e in m_CmdManager.ScriptEngines) | 80 | foreach (IScriptEngine e in m_CmdManager.ScriptEngines) |
81 | { | 81 | { |
82 | if (e.PostObjectEvent(httpInfo.localID, | 82 | if (e.PostObjectEvent(httpInfo.LocalID, |
83 | new EventParams("http_response", | 83 | new EventParams("http_response", |
84 | resobj, new DetectParams[0]))) | 84 | resobj, new DetectParams[0]))) |
85 | break; | 85 | break; |
86 | } | 86 | } |
87 | httpInfo = iHttpReq.GetNextCompletedRequest(); | 87 | httpInfo = (HttpRequestClass)iHttpReq.GetNextCompletedRequest(); |
88 | } | 88 | } |
89 | } | 89 | } |
90 | } | 90 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs index b72d17c..eba52bf 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | using OpenSim.Region.Environment.Interfaces; | 30 | using OpenSim.Region.Framework.Interfaces; |
31 | using OpenSim.Region.Environment.Modules.Scripting.WorldComm; | 31 | using OpenSim.Region.Environment.Modules.Scripting.WorldComm; |
32 | using OpenSim.Region.ScriptEngine.Interfaces; | 32 | using OpenSim.Region.ScriptEngine.Interfaces; |
33 | using OpenSim.Region.ScriptEngine.Shared; | 33 | using OpenSim.Region.ScriptEngine.Shared; |
@@ -56,7 +56,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
56 | { | 56 | { |
57 | while (comms.HasMessages()) | 57 | while (comms.HasMessages()) |
58 | { | 58 | { |
59 | ListenerInfo lInfo = comms.GetNextMessage(); | 59 | ListenerInfo lInfo = (ListenerInfo)comms.GetNextMessage(); |
60 | 60 | ||
61 | //Deliver data to prim's listen handler | 61 | //Deliver data to prim's listen handler |
62 | object[] resobj = new object[] | 62 | object[] resobj = new object[] |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs index 808d880..f132518 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | |||
@@ -30,7 +30,7 @@ using System.Collections.Generic; | |||
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using OpenSim.Framework.Communications.Cache; | 32 | using OpenSim.Framework.Communications.Cache; |
33 | using OpenSim.Region.Environment.Scenes; | 33 | using OpenSim.Region.Framework.Scenes; |
34 | using OpenSim.Region.ScriptEngine.Shared; | 34 | using OpenSim.Region.ScriptEngine.Shared; |
35 | using OpenSim.Region.ScriptEngine.Shared.Api; | 35 | using OpenSim.Region.ScriptEngine.Shared.Api; |
36 | 36 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs index a7699a1..bf1a923 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs | |||
@@ -26,7 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using OpenSim.Region.Environment.Interfaces; | 29 | using OpenSim.Region.Framework.Interfaces; |
30 | using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; | 30 | using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; |
31 | using OpenSim.Region.ScriptEngine.Interfaces; | 31 | using OpenSim.Region.ScriptEngine.Interfaces; |
32 | using OpenSim.Region.ScriptEngine.Shared; | 32 | using OpenSim.Region.ScriptEngine.Shared; |
@@ -52,7 +52,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
52 | 52 | ||
53 | if (xmlrpc != null) | 53 | if (xmlrpc != null) |
54 | { | 54 | { |
55 | RPCRequestInfo rInfo = xmlrpc.GetNextCompletedRequest(); | 55 | RPCRequestInfo rInfo = (RPCRequestInfo)xmlrpc.GetNextCompletedRequest(); |
56 | 56 | ||
57 | while (rInfo != null) | 57 | while (rInfo != null) |
58 | { | 58 | { |
@@ -80,10 +80,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
80 | break; | 80 | break; |
81 | } | 81 | } |
82 | 82 | ||
83 | rInfo = xmlrpc.GetNextCompletedRequest(); | 83 | rInfo = (RPCRequestInfo)xmlrpc.GetNextCompletedRequest(); |
84 | } | 84 | } |
85 | 85 | ||
86 | SendRemoteDataRequest srdInfo = xmlrpc.GetNextCompletedSRDRequest(); | 86 | SendRemoteDataRequest srdInfo = (SendRemoteDataRequest)xmlrpc.GetNextCompletedSRDRequest(); |
87 | 87 | ||
88 | while (srdInfo != null) | 88 | while (srdInfo != null) |
89 | { | 89 | { |
@@ -93,23 +93,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins | |||
93 | object[] resobj = new object[] | 93 | object[] resobj = new object[] |
94 | { | 94 | { |
95 | new LSL_Types.LSLInteger(3), | 95 | new LSL_Types.LSLInteger(3), |
96 | new LSL_Types.LSLString(srdInfo.channel.ToString()), | 96 | new LSL_Types.LSLString(srdInfo.Channel.ToString()), |
97 | new LSL_Types.LSLString(srdInfo.GetReqID().ToString()), | 97 | new LSL_Types.LSLString(srdInfo.GetReqID().ToString()), |
98 | new LSL_Types.LSLString(String.Empty), | 98 | new LSL_Types.LSLString(String.Empty), |
99 | new LSL_Types.LSLInteger(srdInfo.idata), | 99 | new LSL_Types.LSLInteger(srdInfo.Idata), |
100 | new LSL_Types.LSLString(srdInfo.sdata) | 100 | new LSL_Types.LSLString(srdInfo.Sdata) |
101 | }; | 101 | }; |
102 | 102 | ||
103 | foreach (IScriptEngine e in m_CmdManager.ScriptEngines) | 103 | foreach (IScriptEngine e in m_CmdManager.ScriptEngines) |
104 | { | 104 | { |
105 | if (e.PostScriptEvent( | 105 | if (e.PostScriptEvent( |
106 | srdInfo.m_itemID, new EventParams( | 106 | srdInfo.ItemID, new EventParams( |
107 | "remote_data", resobj, | 107 | "remote_data", resobj, |
108 | new DetectParams[0]))) | 108 | new DetectParams[0]))) |
109 | break; | 109 | break; |
110 | } | 110 | } |
111 | 111 | ||
112 | srdInfo = xmlrpc.GetNextCompletedSRDRequest(); | 112 | srdInfo = (SendRemoteDataRequest)xmlrpc.GetNextCompletedSRDRequest(); |
113 | } | 113 | } |
114 | } | 114 | } |
115 | } | 115 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index 3817a07..ceb0f37 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -31,7 +31,7 @@ using System.Threading; | |||
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using System.Collections; | 32 | using System.Collections; |
33 | using System.Collections.Generic; | 33 | using System.Collections.Generic; |
34 | using OpenSim.Region.Environment.Interfaces; | 34 | using OpenSim.Region.Framework.Interfaces; |
35 | using OpenSim.Region.ScriptEngine.Interfaces; | 35 | using OpenSim.Region.ScriptEngine.Interfaces; |
36 | using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces; | 36 | using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces; |
37 | using integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; | 37 | using integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp index 708afab..3cd6b76 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp | |||
@@ -34,6 +34,7 @@ | |||
34 | <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Communications" /> | 34 | <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Communications" /> |
35 | <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Console" /> | 35 | <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Console" /> |
36 | <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.Environment" /> | 36 | <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.Environment" /> |
37 | <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.Framework" /> | ||
37 | <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.ScriptEngine.Shared" /> | 38 | <ProjectReference type="Project" localcopy="False" refto="OpenSim.Region.ScriptEngine.Shared" /> |
38 | <ProjectReference type="Assembly" refto="../../../../../../bin/RAIL.dll" localcopy="False" /> | 39 | <ProjectReference type="Assembly" refto="../../../../../../bin/RAIL.dll" localcopy="False" /> |
39 | <ProjectReference type="Gac" localcopy="False" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> | 40 | <ProjectReference type="Gac" localcopy="False" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 195f48a..0f4e7e5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |||
@@ -33,7 +33,7 @@ using System.IO; | |||
33 | using Microsoft.CSharp; | 33 | using Microsoft.CSharp; |
34 | using Microsoft.JScript; | 34 | using Microsoft.JScript; |
35 | using Microsoft.VisualBasic; | 35 | using Microsoft.VisualBasic; |
36 | using OpenSim.Region.Environment.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.ScriptEngine.Interfaces; | 37 | using OpenSim.Region.ScriptEngine.Interfaces; |
38 | 38 | ||
39 | namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | 39 | namespace OpenSim.Region.ScriptEngine.Shared.CodeTools |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs index b9ff0cd..777cb12 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Helpers.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Helpers.cs | |||
@@ -34,7 +34,7 @@ using System.Runtime.Serialization; | |||
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.Environment; | 36 | using OpenSim.Region.Environment; |
37 | using OpenSim.Region.Environment.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |
38 | 38 | ||
39 | namespace OpenSim.Region.ScriptEngine.Shared | 39 | namespace OpenSim.Region.ScriptEngine.Shared |
40 | { | 40 | { |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index f808f12..6b04248 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -42,8 +42,8 @@ using Nini.Config; | |||
42 | using Amib.Threading; | 42 | using Amib.Threading; |
43 | using OpenSim.Framework; | 43 | using OpenSim.Framework; |
44 | using OpenSim.Region.Environment; | 44 | using OpenSim.Region.Environment; |
45 | using OpenSim.Region.Environment.Scenes; | 45 | using OpenSim.Region.Framework.Scenes; |
46 | using OpenSim.Region.Environment.Interfaces; | 46 | using OpenSim.Region.Framework.Interfaces; |
47 | using OpenSim.Region.ScriptEngine.Shared; | 47 | using OpenSim.Region.ScriptEngine.Shared; |
48 | using OpenSim.Region.ScriptEngine.Shared.Api; | 48 | using OpenSim.Region.ScriptEngine.Shared.Api; |
49 | using OpenSim.Region.ScriptEngine.Shared.Api.Runtime; | 49 | using OpenSim.Region.ScriptEngine.Shared.Api.Runtime; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs index c06960b..7e8d690 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs | |||
@@ -40,8 +40,8 @@ using Nini.Config; | |||
40 | using Amib.Threading; | 40 | using Amib.Threading; |
41 | using OpenSim.Framework; | 41 | using OpenSim.Framework; |
42 | using OpenSim.Region.Environment; | 42 | using OpenSim.Region.Environment; |
43 | using OpenSim.Region.Environment.Scenes; | 43 | using OpenSim.Region.Framework.Scenes; |
44 | using OpenSim.Region.Environment.Interfaces; | 44 | using OpenSim.Region.Framework.Interfaces; |
45 | using OpenSim.Region.ScriptEngine.Shared; | 45 | using OpenSim.Region.ScriptEngine.Shared; |
46 | using OpenSim.Region.ScriptEngine.Shared.Api; | 46 | using OpenSim.Region.ScriptEngine.Shared.Api; |
47 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; | 47 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs index 8355b60..09f751f 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | |||
@@ -31,9 +31,8 @@ using System.Collections.Generic; | |||
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; | 33 | using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; |
34 | using OpenSim.Region.Interfaces; | 34 | using OpenSim.Region.Framework.Scenes; |
35 | using OpenSim.Region.Environment.Scenes; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Region.Environment.Interfaces; | ||
37 | using OpenSim.Region.ScriptEngine.Shared; | 36 | using OpenSim.Region.ScriptEngine.Shared; |
38 | using OpenSim.Region.ScriptEngine.Interfaces; | 37 | using OpenSim.Region.ScriptEngine.Interfaces; |
39 | 38 | ||
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index f0f867b..2cb18ea 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -41,10 +41,9 @@ using log4net; | |||
41 | using Nini.Config; | 41 | using Nini.Config; |
42 | using Amib.Threading; | 42 | using Amib.Threading; |
43 | using OpenSim.Framework; | 43 | using OpenSim.Framework; |
44 | using OpenSim.Region.Interfaces; | ||
45 | using OpenSim.Region.Environment; | 44 | using OpenSim.Region.Environment; |
46 | using OpenSim.Region.Environment.Scenes; | 45 | using OpenSim.Region.Framework.Scenes; |
47 | using OpenSim.Region.Environment.Interfaces; | 46 | using OpenSim.Region.Framework.Interfaces; |
48 | using OpenSim.Region.ScriptEngine.Shared; | 47 | using OpenSim.Region.ScriptEngine.Shared; |
49 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; | 48 | using OpenSim.Region.ScriptEngine.Shared.ScriptBase; |
50 | using OpenSim.Region.ScriptEngine.Shared.CodeTools; | 49 | using OpenSim.Region.ScriptEngine.Shared.CodeTools; |