aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs9
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs20
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs18
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp1
9 files changed, 33 insertions, 33 deletions
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;
31using System.Threading; 31using System.Threading;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.ScriptEngine.Interfaces; 35using OpenSim.Region.ScriptEngine.Interfaces;
36using OpenSim.Region.ScriptEngine.Shared; 36using OpenSim.Region.ScriptEngine.Shared;
37using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; 37using 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;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Communications.Cache; 39using OpenSim.Framework.Communications.Cache;
40using OpenSim.Region.Environment; 40using OpenSim.Region.Environment;
41using OpenSim.Region.Interfaces; 41using OpenSim.Region.Framework.Interfaces;
42using OpenSim.Region.Environment.Interfaces;
43using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; 42using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney;
44using OpenSim.Region.Environment.Modules.World.Land; 43using OpenSim.Region.Environment.Modules.World.Land;
45using OpenSim.Region.Environment.Modules.World.Terrain; 44using OpenSim.Region.Environment.Modules.World.Terrain;
46using OpenSim.Region.Environment.Scenes; 45using OpenSim.Region.Framework.Scenes;
47using OpenSim.Region.Physics.Manager; 46using OpenSim.Region.Physics.Manager;
48using OpenSim.Region.ScriptEngine.Shared; 47using OpenSim.Region.ScriptEngine.Shared;
49using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; 48using 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;
35using OpenSim; 35using OpenSim;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
38using OpenSim.Region.Environment.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Environment.Scenes; 39using OpenSim.Region.Framework.Scenes;
40using OpenSim.Region.ScriptEngine.Shared; 40using OpenSim.Region.ScriptEngine.Shared;
41using OpenSim.Region.ScriptEngine.Shared.Api.Plugins; 41using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
42using OpenSim.Region.ScriptEngine.Shared.ScriptBase; 42using 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
28using System; 28using System;
29using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Environment.Modules.Scripting.HttpRequest; 30using OpenSim.Region.Environment.Modules.Scripting.HttpRequest;
31using OpenSim.Region.ScriptEngine.Shared; 31using OpenSim.Region.ScriptEngine.Shared;
32using OpenSim.Region.ScriptEngine.Interfaces; 32using 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
28using System; 28using System;
29using OpenMetaverse; 29using OpenMetaverse;
30using OpenSim.Region.Environment.Interfaces; 30using OpenSim.Region.Framework.Interfaces;
31using OpenSim.Region.Environment.Modules.Scripting.WorldComm; 31using OpenSim.Region.Environment.Modules.Scripting.WorldComm;
32using OpenSim.Region.ScriptEngine.Interfaces; 32using OpenSim.Region.ScriptEngine.Interfaces;
33using OpenSim.Region.ScriptEngine.Shared; 33using 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;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Framework.Communications.Cache; 32using OpenSim.Framework.Communications.Cache;
33using OpenSim.Region.Environment.Scenes; 33using OpenSim.Region.Framework.Scenes;
34using OpenSim.Region.ScriptEngine.Shared; 34using OpenSim.Region.ScriptEngine.Shared;
35using OpenSim.Region.ScriptEngine.Shared.Api; 35using 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
28using System; 28using System;
29using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Framework.Interfaces;
30using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; 30using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
31using OpenSim.Region.ScriptEngine.Interfaces; 31using OpenSim.Region.ScriptEngine.Interfaces;
32using OpenSim.Region.ScriptEngine.Shared; 32using 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;
31using System.Reflection; 31using System.Reflection;
32using System.Collections; 32using System.Collections;
33using System.Collections.Generic; 33using System.Collections.Generic;
34using OpenSim.Region.Environment.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.ScriptEngine.Interfaces; 35using OpenSim.Region.ScriptEngine.Interfaces;
36using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces; 36using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
37using integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; 37using 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" />