From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sat, 6 Sep 2008 07:52:41 +0000 Subject: * 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. --- .../Modules/Scripting/LoadImageURL/LoadImageURLModule.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/Scripting/LoadImageURL/LoadImageURLModule.cs') 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; using System.Drawing; using System.IO; using System.Net; -using libsecondlife; +using OpenMetaverse; +using OpenMetaverse.Imaging; using Nini.Config; -using OpenJPEGNet; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; @@ -70,13 +70,13 @@ namespace OpenSim.Region.Environment.Modules.Scripting.LoadImageURL return null; } - public bool AsyncConvertUrl(LLUUID id, string url, string extraParams) + public bool AsyncConvertUrl(UUID id, string url, string extraParams) { MakeHttpRequest(url, id); return true; } - public bool AsyncConvertData(LLUUID id, string bodyData, string extraParams) + public bool AsyncConvertData(UUID id, string bodyData, string extraParams) { return false; } @@ -118,7 +118,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.LoadImageURL #endregion - private void MakeHttpRequest(string url, LLUUID requestID) + private void MakeHttpRequest(string url, UUID requestID) { WebRequest request = HttpWebRequest.Create(url); RequestState state = new RequestState((HttpWebRequest) request, requestID); @@ -177,10 +177,10 @@ namespace OpenSim.Region.Environment.Modules.Scripting.LoadImageURL public class RequestState { public HttpWebRequest Request = null; - public LLUUID RequestID = LLUUID.Zero; + public UUID RequestID = UUID.Zero; public int TimeOfRequest = 0; - public RequestState(HttpWebRequest request, LLUUID requestID) + public RequestState(HttpWebRequest request, UUID requestID) { Request = request; RequestID = requestID; @@ -189,4 +189,4 @@ namespace OpenSim.Region.Environment.Modules.Scripting.LoadImageURL #endregion } -} \ No newline at end of file +} -- cgit v1.1