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/LoadImageURL | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC-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 'OpenSim/Region/Environment/Modules/Scripting/LoadImageURL')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs index 725322b..339ad42 100644 --- a/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs +++ b/OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs | |||
@@ -29,9 +29,9 @@ using System; | |||
29 | using System.Drawing; | 29 | using System.Drawing; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Net; | 31 | using System.Net; |
32 | using libsecondlife; | 32 | using OpenMetaverse; |
33 | using OpenMetaverse.Imaging; | ||
33 | using Nini.Config; | 34 | using Nini.Config; |
34 | using OpenJPEGNet; | ||
35 | using OpenSim.Region.Environment.Interfaces; | 35 | using OpenSim.Region.Environment.Interfaces; |
36 | using OpenSim.Region.Environment.Scenes; | 36 | using OpenSim.Region.Environment.Scenes; |
37 | 37 | ||
@@ -70,13 +70,13 @@ namespace OpenSim.Region.Environment.Modules.Scripting.LoadImageURL | |||
70 | return null; | 70 | return null; |
71 | } | 71 | } |
72 | 72 | ||
73 | public bool AsyncConvertUrl(LLUUID id, string url, string extraParams) | 73 | public bool AsyncConvertUrl(UUID id, string url, string extraParams) |
74 | { | 74 | { |
75 | MakeHttpRequest(url, id); | 75 | MakeHttpRequest(url, id); |
76 | return true; | 76 | return true; |
77 | } | 77 | } |
78 | 78 | ||
79 | public bool AsyncConvertData(LLUUID id, string bodyData, string extraParams) | 79 | public bool AsyncConvertData(UUID id, string bodyData, string extraParams) |
80 | { | 80 | { |
81 | return false; | 81 | return false; |
82 | } | 82 | } |
@@ -118,7 +118,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.LoadImageURL | |||
118 | 118 | ||
119 | #endregion | 119 | #endregion |
120 | 120 | ||
121 | private void MakeHttpRequest(string url, LLUUID requestID) | 121 | private void MakeHttpRequest(string url, UUID requestID) |
122 | { | 122 | { |
123 | WebRequest request = HttpWebRequest.Create(url); | 123 | WebRequest request = HttpWebRequest.Create(url); |
124 | RequestState state = new RequestState((HttpWebRequest) request, requestID); | 124 | RequestState state = new RequestState((HttpWebRequest) request, requestID); |
@@ -177,10 +177,10 @@ namespace OpenSim.Region.Environment.Modules.Scripting.LoadImageURL | |||
177 | public class RequestState | 177 | public class RequestState |
178 | { | 178 | { |
179 | public HttpWebRequest Request = null; | 179 | public HttpWebRequest Request = null; |
180 | public LLUUID RequestID = LLUUID.Zero; | 180 | public UUID RequestID = UUID.Zero; |
181 | public int TimeOfRequest = 0; | 181 | public int TimeOfRequest = 0; |
182 | 182 | ||
183 | public RequestState(HttpWebRequest request, LLUUID requestID) | 183 | public RequestState(HttpWebRequest request, UUID requestID) |
184 | { | 184 | { |
185 | Request = request; | 185 | Request = request; |
186 | RequestID = requestID; | 186 | RequestID = requestID; |
@@ -189,4 +189,4 @@ namespace OpenSim.Region.Environment.Modules.Scripting.LoadImageURL | |||
189 | 189 | ||
190 | #endregion | 190 | #endregion |
191 | } | 191 | } |
192 | } \ No newline at end of file | 192 | } |