diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs index 1eb0387..9595588 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs | |||
@@ -31,7 +31,7 @@ using System.IO; | |||
31 | using System.Net; | 31 | using System.Net; |
32 | using System.Text; | 32 | using System.Text; |
33 | using System.Threading; | 33 | using System.Threading; |
34 | using libsecondlife; | 34 | using OpenMetaverse; |
35 | using Nini.Config; | 35 | using Nini.Config; |
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Framework.Servers; | 37 | using OpenSim.Framework.Servers; |
@@ -91,7 +91,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest | |||
91 | private string m_name = "HttpScriptRequests"; | 91 | private string m_name = "HttpScriptRequests"; |
92 | 92 | ||
93 | // <request id, HttpRequestClass> | 93 | // <request id, HttpRequestClass> |
94 | private Dictionary<LLUUID, HttpRequestClass> m_pendingRequests; | 94 | private Dictionary<UUID, HttpRequestClass> m_pendingRequests; |
95 | private Scene m_scene; | 95 | private Scene m_scene; |
96 | // private Queue<HttpRequestClass> rpcQueue = new Queue<HttpRequestClass>(); | 96 | // private Queue<HttpRequestClass> rpcQueue = new Queue<HttpRequestClass>(); |
97 | 97 | ||
@@ -101,14 +101,14 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest | |||
101 | 101 | ||
102 | #region IHttpRequests Members | 102 | #region IHttpRequests Members |
103 | 103 | ||
104 | public LLUUID MakeHttpRequest(string url, string parameters, string body) | 104 | public UUID MakeHttpRequest(string url, string parameters, string body) |
105 | { | 105 | { |
106 | return LLUUID.Zero; | 106 | return UUID.Zero; |
107 | } | 107 | } |
108 | 108 | ||
109 | public LLUUID StartHttpRequest(uint localID, LLUUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body) | 109 | public UUID StartHttpRequest(uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body) |
110 | { | 110 | { |
111 | LLUUID reqID = LLUUID.Random(); | 111 | UUID reqID = UUID.Random(); |
112 | HttpRequestClass htc = new HttpRequestClass(); | 112 | HttpRequestClass htc = new HttpRequestClass(); |
113 | 113 | ||
114 | // Partial implementation: support for parameter flags needed | 114 | // Partial implementation: support for parameter flags needed |
@@ -163,7 +163,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest | |||
163 | return reqID; | 163 | return reqID; |
164 | } | 164 | } |
165 | 165 | ||
166 | public void StopHttpRequest(uint m_localID, LLUUID m_itemID) | 166 | public void StopHttpRequest(uint m_localID, UUID m_itemID) |
167 | { | 167 | { |
168 | if (m_pendingRequests != null) | 168 | if (m_pendingRequests != null) |
169 | { | 169 | { |
@@ -192,7 +192,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest | |||
192 | { | 192 | { |
193 | lock (HttpListLock) | 193 | lock (HttpListLock) |
194 | { | 194 | { |
195 | foreach (LLUUID luid in m_pendingRequests.Keys) | 195 | foreach (UUID luid in m_pendingRequests.Keys) |
196 | { | 196 | { |
197 | HttpRequestClass tmpReq; | 197 | HttpRequestClass tmpReq; |
198 | 198 | ||
@@ -208,7 +208,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest | |||
208 | return null; | 208 | return null; |
209 | } | 209 | } |
210 | 210 | ||
211 | public void RemoveCompletedRequest(LLUUID id) | 211 | public void RemoveCompletedRequest(UUID id) |
212 | { | 212 | { |
213 | lock (HttpListLock) | 213 | lock (HttpListLock) |
214 | { | 214 | { |
@@ -232,7 +232,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest | |||
232 | 232 | ||
233 | m_scene.RegisterModuleInterface<IHttpRequests>(this); | 233 | m_scene.RegisterModuleInterface<IHttpRequests>(this); |
234 | 234 | ||
235 | m_pendingRequests = new Dictionary<LLUUID, HttpRequestClass>(); | 235 | m_pendingRequests = new Dictionary<UUID, HttpRequestClass>(); |
236 | } | 236 | } |
237 | 237 | ||
238 | public void PostInitialise() | 238 | public void PostInitialise() |
@@ -274,11 +274,11 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest | |||
274 | public bool httpVerifyCert = true; // not implemented | 274 | public bool httpVerifyCert = true; // not implemented |
275 | 275 | ||
276 | // Request info | 276 | // Request info |
277 | public LLUUID itemID; | 277 | public UUID itemID; |
278 | public uint localID; | 278 | public uint localID; |
279 | public DateTime next; | 279 | public DateTime next; |
280 | public string outbound_body; | 280 | public string outbound_body; |
281 | public LLUUID reqID; | 281 | public UUID reqID; |
282 | public HttpWebRequest request; | 282 | public HttpWebRequest request; |
283 | public string response_body; | 283 | public string response_body; |
284 | public List<string> response_metadata; | 284 | public List<string> response_metadata; |