diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting')
9 files changed, 85 insertions, 85 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs index 665d7f7..c369d87 100644 --- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | |||
@@ -181,12 +181,12 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
181 | string extraParams, int updateTimer, bool SetBlending, byte AlphaValue) | 181 | string extraParams, int updateTimer, bool SetBlending, byte AlphaValue) |
182 | { | 182 | { |
183 | return AddDynamicTextureURL(simID, primID, contentType, url, | 183 | return AddDynamicTextureURL(simID, primID, contentType, url, |
184 | extraParams, updateTimer, SetBlending, | 184 | extraParams, updateTimer, SetBlending, |
185 | (int)(DISP_TEMP|DISP_EXPIRE), AlphaValue, ALL_SIDES); | 185 | (int)(DISP_TEMP|DISP_EXPIRE), AlphaValue, ALL_SIDES); |
186 | } | 186 | } |
187 | 187 | ||
188 | public UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, | 188 | public UUID AddDynamicTextureURL(UUID simID, UUID primID, string contentType, string url, |
189 | string extraParams, int updateTimer, bool SetBlending, | 189 | string extraParams, int updateTimer, bool SetBlending, |
190 | int disp, byte AlphaValue, int face) | 190 | int disp, byte AlphaValue, int face) |
191 | { | 191 | { |
192 | if (RenderPlugins.ContainsKey(contentType)) | 192 | if (RenderPlugins.ContainsKey(contentType)) |
@@ -227,7 +227,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
227 | public UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, | 227 | public UUID AddDynamicTextureData(UUID simID, UUID primID, string contentType, string data, |
228 | string extraParams, int updateTimer, bool SetBlending, byte AlphaValue) | 228 | string extraParams, int updateTimer, bool SetBlending, byte AlphaValue) |
229 | { | 229 | { |
230 | return AddDynamicTextureData(simID, primID, contentType, data, extraParams, updateTimer, SetBlending, | 230 | return AddDynamicTextureData(simID, primID, contentType, data, extraParams, updateTimer, SetBlending, |
231 | (int) (DISP_TEMP|DISP_EXPIRE), AlphaValue, ALL_SIDES); | 231 | (int) (DISP_TEMP|DISP_EXPIRE), AlphaValue, ALL_SIDES); |
232 | } | 232 | } |
233 | 233 | ||
@@ -478,17 +478,17 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
478 | 478 | ||
479 | if (part == null || data == null || data.Length <= 1) | 479 | if (part == null || data == null || data.Length <= 1) |
480 | { | 480 | { |
481 | string msg = | 481 | string msg = |
482 | String.Format("DynamicTextureModule: Error preparing image using URL {0}", Url); | 482 | String.Format("DynamicTextureModule: Error preparing image using URL {0}", Url); |
483 | scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Say, | 483 | scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Say, |
484 | 0, part.ParentGroup.RootPart.AbsolutePosition, part.Name, part.UUID, false); | 484 | 0, part.ParentGroup.RootPart.AbsolutePosition, part.Name, part.UUID, false); |
485 | 485 | ||
486 | return UUID.Zero; | 486 | return UUID.Zero; |
487 | } | 487 | } |
488 | 488 | ||
489 | byte[] assetData = null; | 489 | byte[] assetData = null; |
490 | AssetBase oldAsset = null; | 490 | AssetBase oldAsset = null; |
491 | 491 | ||
492 | if (BlendWithOldTexture) | 492 | if (BlendWithOldTexture) |
493 | { | 493 | { |
494 | Primitive.TextureEntryFace defaultFace = part.Shape.Textures.DefaultTexture; | 494 | Primitive.TextureEntryFace defaultFace = part.Shape.Textures.DefaultTexture; |
@@ -558,7 +558,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
558 | 558 | ||
559 | Bitmap image1 = new Bitmap(image); | 559 | Bitmap image1 = new Bitmap(image); |
560 | image.Dispose(); | 560 | image.Dispose(); |
561 | 561 | ||
562 | if (!OpenJPEG.DecodeToImage(backImage, out managedImage, out image) || image == null) | 562 | if (!OpenJPEG.DecodeToImage(backImage, out managedImage, out image) || image == null) |
563 | { | 563 | { |
564 | image1.Dispose(); | 564 | image1.Dispose(); |
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs index 3948667..09891f7 100644 --- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | |||
@@ -246,7 +246,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
246 | } | 246 | } |
247 | } | 247 | } |
248 | } | 248 | } |
249 | 249 | ||
250 | htc.RequestModule = this; | 250 | htc.RequestModule = this; |
251 | htc.LocalID = localID; | 251 | htc.LocalID = localID; |
252 | htc.ItemID = itemID; | 252 | htc.ItemID = itemID; |
@@ -283,7 +283,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
283 | } | 283 | } |
284 | 284 | ||
285 | public bool StartHttpRequest(HttpRequestClass req) | 285 | public bool StartHttpRequest(HttpRequestClass req) |
286 | { | 286 | { |
287 | if (!CheckAllowed(new Uri(req.Url))) | 287 | if (!CheckAllowed(new Uri(req.Url))) |
288 | return false; | 288 | return false; |
289 | 289 | ||
@@ -541,7 +541,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
541 | try | 541 | try |
542 | { | 542 | { |
543 | Request = (HttpWebRequest)WebRequest.Create(Url); | 543 | Request = (HttpWebRequest)WebRequest.Create(Url); |
544 | Request.AllowAutoRedirect = false; | 544 | Request.AllowAutoRedirect = false; |
545 | 545 | ||
546 | //This works around some buggy HTTP Servers like Lighttpd | 546 | //This works around some buggy HTTP Servers like Lighttpd |
547 | Request.ServicePoint.Expect100Continue = false; | 547 | Request.ServicePoint.Expect100Continue = false; |
@@ -684,9 +684,9 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
684 | resStream.Close(); | 684 | resStream.Close(); |
685 | if (response != null) | 685 | if (response != null) |
686 | response.Close(); | 686 | response.Close(); |
687 | |||
688 | 687 | ||
689 | // We need to resubmit | 688 | |
689 | // We need to resubmit | ||
690 | if ( | 690 | if ( |
691 | (Status == (int)HttpStatusCode.MovedPermanently | 691 | (Status == (int)HttpStatusCode.MovedPermanently |
692 | || Status == (int)HttpStatusCode.Found | 692 | || Status == (int)HttpStatusCode.Found |
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs index d22487e..7e223d7 100644 --- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs +++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs | |||
@@ -45,7 +45,7 @@ using OpenSim.Tests.Common; | |||
45 | namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests | 45 | namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests |
46 | { | 46 | { |
47 | class TestWebRequestCreate : IWebRequestCreate | 47 | class TestWebRequestCreate : IWebRequestCreate |
48 | { | 48 | { |
49 | public TestWebRequest NextRequest { get; set; } | 49 | public TestWebRequest NextRequest { get; set; } |
50 | 50 | ||
51 | public WebRequest Create(Uri uri) | 51 | public WebRequest Create(Uri uri) |
@@ -65,13 +65,13 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests | |||
65 | 65 | ||
66 | public Func<IAsyncResult, WebResponse> OnEndGetResponse { get; set; } | 66 | public Func<IAsyncResult, WebResponse> OnEndGetResponse { get; set; } |
67 | 67 | ||
68 | public TestWebRequest() : base() | 68 | public TestWebRequest() : base() |
69 | { | 69 | { |
70 | // Console.WriteLine("created"); | 70 | // Console.WriteLine("created"); |
71 | } | 71 | } |
72 | 72 | ||
73 | // public TestWebRequest(SerializationInfo serializationInfo, StreamingContext streamingContext) | 73 | // public TestWebRequest(SerializationInfo serializationInfo, StreamingContext streamingContext) |
74 | // : base(serializationInfo, streamingContext) | 74 | // : base(serializationInfo, streamingContext) |
75 | // { | 75 | // { |
76 | // Console.WriteLine("created"); | 76 | // Console.WriteLine("created"); |
77 | // } | 77 | // } |
@@ -97,7 +97,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests | |||
97 | public string Response { get; set; } | 97 | public string Response { get; set; } |
98 | 98 | ||
99 | #pragma warning disable 0618 | 99 | #pragma warning disable 0618 |
100 | public TestHttpWebResponse(SerializationInfo serializationInfo, StreamingContext streamingContext) | 100 | public TestHttpWebResponse(SerializationInfo serializationInfo, StreamingContext streamingContext) |
101 | : base(serializationInfo, streamingContext) {} | 101 | : base(serializationInfo, streamingContext) {} |
102 | #pragma warning restore 0618 | 102 | #pragma warning restore 0618 |
103 | 103 | ||
@@ -111,24 +111,24 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests | |||
111 | { | 111 | { |
112 | WaitHandle m_wh = new ManualResetEvent(true); | 112 | WaitHandle m_wh = new ManualResetEvent(true); |
113 | 113 | ||
114 | object IAsyncResult.AsyncState | 114 | object IAsyncResult.AsyncState |
115 | { | 115 | { |
116 | get { | 116 | get { |
117 | throw new System.NotImplementedException (); | 117 | throw new System.NotImplementedException (); |
118 | } | 118 | } |
119 | } | 119 | } |
120 | 120 | ||
121 | WaitHandle IAsyncResult.AsyncWaitHandle | 121 | WaitHandle IAsyncResult.AsyncWaitHandle |
122 | { | 122 | { |
123 | get { return m_wh; } | 123 | get { return m_wh; } |
124 | } | 124 | } |
125 | 125 | ||
126 | bool IAsyncResult.CompletedSynchronously | 126 | bool IAsyncResult.CompletedSynchronously |
127 | { | 127 | { |
128 | get { return false; } | 128 | get { return false; } |
129 | } | 129 | } |
130 | 130 | ||
131 | bool IAsyncResult.IsCompleted | 131 | bool IAsyncResult.IsCompleted |
132 | { | 132 | { |
133 | get { return true; } | 133 | get { return true; } |
134 | } | 134 | } |
@@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests | |||
155 | TestHelpers.EnableLogging(); | 155 | TestHelpers.EnableLogging(); |
156 | 156 | ||
157 | if (!Util.IsPlatformMono) | 157 | if (!Util.IsPlatformMono) |
158 | Assert.Ignore("Ignoring test since can only currently run on Mono"); | 158 | Assert.Ignore("Ignoring test since can only currently run on Mono"); |
159 | 159 | ||
160 | string rawResponse = "boom"; | 160 | string rawResponse = "boom"; |
161 | 161 | ||
@@ -163,7 +163,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests | |||
163 | 163 | ||
164 | TestWebRequest twr = new TestWebRequest(); | 164 | TestWebRequest twr = new TestWebRequest(); |
165 | //twr.OnEndGetResponse += ar => new TestHttpWebResponse(null, new StreamingContext()); | 165 | //twr.OnEndGetResponse += ar => new TestHttpWebResponse(null, new StreamingContext()); |
166 | twr.OnEndGetResponse += ar => | 166 | twr.OnEndGetResponse += ar => |
167 | { | 167 | { |
168 | SerializationInfo si = new SerializationInfo(typeof(HttpWebResponse), new FormatterConverter()); | 168 | SerializationInfo si = new SerializationInfo(typeof(HttpWebResponse), new FormatterConverter()); |
169 | StreamingContext sc = new StreamingContext(); | 169 | StreamingContext sc = new StreamingContext(); |
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index f563c68..bb80a88 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
105 | /// </summary> | 105 | /// </summary> |
106 | public int TotalUrls { get; set; } | 106 | public int TotalUrls { get; set; } |
107 | 107 | ||
108 | public Type ReplaceableInterface | 108 | public Type ReplaceableInterface |
109 | { | 109 | { |
110 | get { return null; } | 110 | get { return null; } |
111 | } | 111 | } |
@@ -221,10 +221,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
221 | urlData.allowXss = true; | 221 | urlData.allowXss = true; |
222 | 222 | ||
223 | m_UrlMap[url] = urlData; | 223 | m_UrlMap[url] = urlData; |
224 | 224 | ||
225 | string uri = "/lslhttp/" + urlcode.ToString() + "/"; | 225 | string uri = "/lslhttp/" + urlcode.ToString() + "/"; |
226 | 226 | ||
227 | PollServiceEventArgs args | 227 | PollServiceEventArgs args |
228 | = new PollServiceEventArgs(HttpRequestHandler, uri, HasEvents, GetEvents, NoEvents, urlcode, 25000); | 228 | = new PollServiceEventArgs(HttpRequestHandler, uri, HasEvents, GetEvents, NoEvents, urlcode, 25000); |
229 | args.Type = PollServiceEventArgs.EventType.LslHttp; | 229 | args.Type = PollServiceEventArgs.EventType.LslHttp; |
230 | m_HttpServer.AddPollServiceHTTPHandler(uri, args); | 230 | m_HttpServer.AddPollServiceHTTPHandler(uri, args); |
@@ -270,12 +270,12 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
270 | 270 | ||
271 | if (options != null && options["allowXss"] != null) | 271 | if (options != null && options["allowXss"] != null) |
272 | urlData.allowXss = true; | 272 | urlData.allowXss = true; |
273 | 273 | ||
274 | m_UrlMap[url] = urlData; | 274 | m_UrlMap[url] = urlData; |
275 | 275 | ||
276 | string uri = "/lslhttps/" + urlcode.ToString() + "/"; | 276 | string uri = "/lslhttps/" + urlcode.ToString() + "/"; |
277 | 277 | ||
278 | PollServiceEventArgs args | 278 | PollServiceEventArgs args |
279 | = new PollServiceEventArgs(HttpRequestHandler, uri, HasEvents, GetEvents, NoEvents, urlcode, 25000); | 279 | = new PollServiceEventArgs(HttpRequestHandler, uri, HasEvents, GetEvents, NoEvents, urlcode, 25000); |
280 | args.Type = PollServiceEventArgs.EventType.LslHttp; | 280 | args.Type = PollServiceEventArgs.EventType.LslHttp; |
281 | m_HttpsServer.AddPollServiceHTTPHandler(uri, args); | 281 | m_HttpsServer.AddPollServiceHTTPHandler(uri, args); |
@@ -306,7 +306,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
306 | foreach (UUID req in data.requests.Keys) | 306 | foreach (UUID req in data.requests.Keys) |
307 | m_RequestMap.Remove(req); | 307 | m_RequestMap.Remove(req); |
308 | } | 308 | } |
309 | 309 | ||
310 | // m_log.DebugFormat( | 310 | // m_log.DebugFormat( |
311 | // "[URL MODULE]: Releasing url {0} for {1} in {2}", | 311 | // "[URL MODULE]: Releasing url {0} for {1} in {2}", |
312 | // url, data.itemID, data.hostID); | 312 | // url, data.itemID, data.hostID); |
@@ -315,7 +315,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
315 | m_UrlMap.Remove(url); | 315 | m_UrlMap.Remove(url); |
316 | } | 316 | } |
317 | } | 317 | } |
318 | 318 | ||
319 | public void HttpContentType(UUID request, string type) | 319 | public void HttpContentType(UUID request, string type) |
320 | { | 320 | { |
321 | lock (m_UrlMap) | 321 | lock (m_UrlMap) |
@@ -331,7 +331,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
331 | } | 331 | } |
332 | } | 332 | } |
333 | } | 333 | } |
334 | 334 | ||
335 | public void HttpResponse(UUID request, int status, string body) | 335 | public void HttpResponse(UUID request, int status, string body) |
336 | { | 336 | { |
337 | lock (m_RequestMap) | 337 | lock (m_RequestMap) |
@@ -403,7 +403,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
403 | public void ScriptRemoved(UUID itemID) | 403 | public void ScriptRemoved(UUID itemID) |
404 | { | 404 | { |
405 | // m_log.DebugFormat("[URL MODULE]: Removing script {0}", itemID); | 405 | // m_log.DebugFormat("[URL MODULE]: Removing script {0}", itemID); |
406 | 406 | ||
407 | lock (m_UrlMap) | 407 | lock (m_UrlMap) |
408 | { | 408 | { |
409 | List<string> removeURLs = new List<string>(); | 409 | List<string> removeURLs = new List<string>(); |
@@ -495,14 +495,14 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
495 | return response; | 495 | return response; |
496 | } | 496 | } |
497 | 497 | ||
498 | 498 | ||
499 | return response; | 499 | return response; |
500 | } | 500 | } |
501 | 501 | ||
502 | private bool HasEvents(UUID requestID, UUID sessionID) | 502 | private bool HasEvents(UUID requestID, UUID sessionID) |
503 | { | 503 | { |
504 | UrlData url=null; | 504 | UrlData url=null; |
505 | 505 | ||
506 | lock (m_RequestMap) | 506 | lock (m_RequestMap) |
507 | { | 507 | { |
508 | if (!m_RequestMap.ContainsKey(requestID)) | 508 | if (!m_RequestMap.ContainsKey(requestID)) |
@@ -545,10 +545,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
545 | { | 545 | { |
546 | requestData = url.requests[requestID]; | 546 | requestData = url.requests[requestID]; |
547 | } | 547 | } |
548 | 548 | ||
549 | if (!requestData.requestDone) | 549 | if (!requestData.requestDone) |
550 | return NoEvents(requestID,sessionID); | 550 | return NoEvents(requestID,sessionID); |
551 | 551 | ||
552 | Hashtable response = new Hashtable(); | 552 | Hashtable response = new Hashtable(); |
553 | 553 | ||
554 | if (System.Environment.TickCount - requestData.startTime > 25000) | 554 | if (System.Environment.TickCount - requestData.startTime > 25000) |
@@ -569,7 +569,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
569 | 569 | ||
570 | if (url.allowXss) | 570 | if (url.allowXss) |
571 | response["access_control_allow_origin"] = "*"; | 571 | response["access_control_allow_origin"] = "*"; |
572 | 572 | ||
573 | //remove from map | 573 | //remove from map |
574 | lock (url.requests) | 574 | lock (url.requests) |
575 | { | 575 | { |
@@ -627,7 +627,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
627 | } | 627 | } |
628 | 628 | ||
629 | //for llGetHttpHeader support we need to store original URI here | 629 | //for llGetHttpHeader support we need to store original URI here |
630 | //to make x-path-info / x-query-string / x-script-url / x-remote-ip headers | 630 | //to make x-path-info / x-query-string / x-script-url / x-remote-ip headers |
631 | //as per http://wiki.secondlife.com/wiki/LlGetHTTPHeader | 631 | //as per http://wiki.secondlife.com/wiki/LlGetHTTPHeader |
632 | 632 | ||
633 | RequestData requestData = new RequestData(); | 633 | RequestData requestData = new RequestData(); |
@@ -689,7 +689,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
689 | else | 689 | else |
690 | { | 690 | { |
691 | queryString = queryString + val + "&"; | 691 | queryString = queryString + val + "&"; |
692 | } | 692 | } |
693 | } | 693 | } |
694 | } | 694 | } |
695 | if (queryString.Length > 1) | 695 | if (queryString.Length > 1) |
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs index 7267515..673a453 100644 --- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs | |||
@@ -98,7 +98,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL | |||
98 | return false; | 98 | return false; |
99 | } | 99 | } |
100 | 100 | ||
101 | public void GetDrawStringSize(string text, string fontName, int fontSize, | 101 | public void GetDrawStringSize(string text, string fontName, int fontSize, |
102 | out double xSize, out double ySize) | 102 | out double xSize, out double ySize) |
103 | { | 103 | { |
104 | xSize = 0; | 104 | xSize = 0; |
@@ -124,7 +124,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL | |||
124 | { | 124 | { |
125 | if (m_scene == null) | 125 | if (m_scene == null) |
126 | m_scene = scene; | 126 | m_scene = scene; |
127 | 127 | ||
128 | } | 128 | } |
129 | 129 | ||
130 | public void RemoveRegion(Scene scene) | 130 | public void RemoveRegion(Scene scene) |
@@ -166,15 +166,15 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL | |||
166 | 166 | ||
167 | HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); | 167 | HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); |
168 | request.AllowAutoRedirect = false; | 168 | request.AllowAutoRedirect = false; |
169 | 169 | ||
170 | if (!string.IsNullOrEmpty(m_proxyurl)) | 170 | if (!string.IsNullOrEmpty(m_proxyurl)) |
171 | { | 171 | { |
172 | if (!string.IsNullOrEmpty(m_proxyexcepts)) | 172 | if (!string.IsNullOrEmpty(m_proxyexcepts)) |
173 | { | 173 | { |
174 | string[] elist = m_proxyexcepts.Split(';'); | 174 | string[] elist = m_proxyexcepts.Split(';'); |
175 | request.Proxy = new WebProxy(m_proxyurl, true, elist); | 175 | request.Proxy = new WebProxy(m_proxyurl, true, elist); |
176 | } | 176 | } |
177 | else | 177 | else |
178 | { | 178 | { |
179 | request.Proxy = new WebProxy(m_proxyurl, true); | 179 | request.Proxy = new WebProxy(m_proxyurl, true); |
180 | } | 180 | } |
@@ -253,7 +253,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL | |||
253 | { | 253 | { |
254 | imageJ2000 = OpenJPEG.EncodeFromImage(resize, true); | 254 | imageJ2000 = OpenJPEG.EncodeFromImage(resize, true); |
255 | } | 255 | } |
256 | } | 256 | } |
257 | catch (Exception) | 257 | catch (Exception) |
258 | { | 258 | { |
259 | m_log.Error("[LOADIMAGEURLMODULE]: OpenJpeg Conversion Failed. Empty byte data returned!"); | 259 | m_log.Error("[LOADIMAGEURLMODULE]: OpenJpeg Conversion Failed. Empty byte data returned!"); |
diff --git a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs index ad33f23..9c3f08e 100644 --- a/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs | |||
@@ -89,7 +89,7 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms | |||
89 | public void RegionLoaded(Scene scene) | 89 | public void RegionLoaded(Scene scene) |
90 | { | 90 | { |
91 | m_scriptModule = scene.RequestModuleInterface<IScriptModule>(); | 91 | m_scriptModule = scene.RequestModuleInterface<IScriptModule>(); |
92 | 92 | ||
93 | if (m_scriptModule != null) | 93 | if (m_scriptModule != null) |
94 | m_log.Info("[MODULE COMMANDS]: Script engine found, module active"); | 94 | m_log.Info("[MODULE COMMANDS]: Script engine found, module active"); |
95 | } | 95 | } |
@@ -237,7 +237,7 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms | |||
237 | } | 237 | } |
238 | } | 238 | } |
239 | } | 239 | } |
240 | 240 | ||
241 | public Delegate[] GetScriptInvocationList() | 241 | public Delegate[] GetScriptInvocationList() |
242 | { | 242 | { |
243 | List<Delegate> ret = new List<Delegate>(); | 243 | List<Delegate> ret = new List<Delegate>(); |
@@ -361,14 +361,14 @@ namespace OpenSim.Region.CoreModules.Scripting.ScriptModuleComms | |||
361 | public object LookupModConstant(string cname) | 361 | public object LookupModConstant(string cname) |
362 | { | 362 | { |
363 | // m_log.DebugFormat("[MODULE COMMANDS] lookup constant <{0}>",cname); | 363 | // m_log.DebugFormat("[MODULE COMMANDS] lookup constant <{0}>",cname); |
364 | 364 | ||
365 | lock (m_constants) | 365 | lock (m_constants) |
366 | { | 366 | { |
367 | object value = null; | 367 | object value = null; |
368 | if (m_constants.TryGetValue(cname,out value)) | 368 | if (m_constants.TryGetValue(cname,out value)) |
369 | return value; | 369 | return value; |
370 | } | 370 | } |
371 | 371 | ||
372 | return null; | 372 | return null; |
373 | } | 373 | } |
374 | 374 | ||
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs index 2fc89fc..f12286d 100644 --- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | |||
@@ -117,7 +117,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
117 | return true; | 117 | return true; |
118 | } | 118 | } |
119 | 119 | ||
120 | public void GetDrawStringSize(string text, string fontName, int fontSize, | 120 | public void GetDrawStringSize(string text, string fontName, int fontSize, |
121 | out double xSize, out double ySize) | 121 | out double xSize, out double ySize) |
122 | { | 122 | { |
123 | lock (this) | 123 | lock (this) |
@@ -209,32 +209,32 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
209 | int alpha = 255; // 0 is transparent | 209 | int alpha = 255; // 0 is transparent |
210 | Color bgColor = Color.White; // Default background color | 210 | Color bgColor = Color.White; // Default background color |
211 | char altDataDelim = ';'; | 211 | char altDataDelim = ';'; |
212 | 212 | ||
213 | char[] paramDelimiter = { ',' }; | 213 | char[] paramDelimiter = { ',' }; |
214 | char[] nvpDelimiter = { ':' }; | 214 | char[] nvpDelimiter = { ':' }; |
215 | 215 | ||
216 | extraParams = extraParams.Trim(); | 216 | extraParams = extraParams.Trim(); |
217 | extraParams = extraParams.ToLower(); | 217 | extraParams = extraParams.ToLower(); |
218 | 218 | ||
219 | string[] nvps = extraParams.Split(paramDelimiter); | 219 | string[] nvps = extraParams.Split(paramDelimiter); |
220 | 220 | ||
221 | int temp = -1; | 221 | int temp = -1; |
222 | foreach (string pair in nvps) | 222 | foreach (string pair in nvps) |
223 | { | 223 | { |
224 | string[] nvp = pair.Split(nvpDelimiter); | 224 | string[] nvp = pair.Split(nvpDelimiter); |
225 | string name = ""; | 225 | string name = ""; |
226 | string value = ""; | 226 | string value = ""; |
227 | 227 | ||
228 | if (nvp[0] != null) | 228 | if (nvp[0] != null) |
229 | { | 229 | { |
230 | name = nvp[0].Trim(); | 230 | name = nvp[0].Trim(); |
231 | } | 231 | } |
232 | 232 | ||
233 | if (nvp.Length == 2) | 233 | if (nvp.Length == 2) |
234 | { | 234 | { |
235 | value = nvp[1].Trim(); | 235 | value = nvp[1].Trim(); |
236 | } | 236 | } |
237 | 237 | ||
238 | switch (name) | 238 | switch (name) |
239 | { | 239 | { |
240 | case "width": | 240 | case "width": |
@@ -301,7 +301,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
301 | if (Int32.TryParse(value, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out hex)) | 301 | if (Int32.TryParse(value, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out hex)) |
302 | { | 302 | { |
303 | bgColor = Color.FromArgb(hex); | 303 | bgColor = Color.FromArgb(hex); |
304 | } | 304 | } |
305 | else | 305 | else |
306 | { | 306 | { |
307 | bgColor = Color.FromName(value); | 307 | bgColor = Color.FromName(value); |
@@ -321,7 +321,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
321 | } | 321 | } |
322 | else | 322 | else |
323 | { | 323 | { |
324 | // this function used to accept an int on its own that represented both | 324 | // this function used to accept an int on its own that represented both |
325 | // width and height, this is to maintain backwards compat, could be removed | 325 | // width and height, this is to maintain backwards compat, could be removed |
326 | // but would break existing scripts | 326 | // but would break existing scripts |
327 | temp = parseIntParam(name); | 327 | temp = parseIntParam(name); |
@@ -329,10 +329,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
329 | { | 329 | { |
330 | if (temp > 1024) | 330 | if (temp > 1024) |
331 | temp = 1024; | 331 | temp = 1024; |
332 | 332 | ||
333 | if (temp < 128) | 333 | if (temp < 128) |
334 | temp = 128; | 334 | temp = 128; |
335 | 335 | ||
336 | width = temp; | 336 | width = temp; |
337 | height = temp; | 337 | height = temp; |
338 | } | 338 | } |
@@ -358,10 +358,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
358 | bitmap = new Bitmap(width, height, PixelFormat.Format32bppRgb); | 358 | bitmap = new Bitmap(width, height, PixelFormat.Format32bppRgb); |
359 | else | 359 | else |
360 | bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb); | 360 | bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb); |
361 | 361 | ||
362 | graph = Graphics.FromImage(bitmap); | 362 | graph = Graphics.FromImage(bitmap); |
363 | 363 | ||
364 | // this is really just to save people filling the | 364 | // this is really just to save people filling the |
365 | // background color in their scripts, only do when fully opaque | 365 | // background color in their scripts, only do when fully opaque |
366 | if (alpha >= 255) | 366 | if (alpha >= 255) |
367 | { | 367 | { |
@@ -370,10 +370,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
370 | graph.FillRectangle(bgFillBrush, 0, 0, width, height); | 370 | graph.FillRectangle(bgFillBrush, 0, 0, width, height); |
371 | } | 371 | } |
372 | } | 372 | } |
373 | 373 | ||
374 | for (int w = 0; w < bitmap.Width; w++) | 374 | for (int w = 0; w < bitmap.Width; w++) |
375 | { | 375 | { |
376 | if (alpha <= 255) | 376 | if (alpha <= 255) |
377 | { | 377 | { |
378 | for (int h = 0; h < bitmap.Height; h++) | 378 | for (int h = 0; h < bitmap.Height; h++) |
379 | { | 379 | { |
@@ -381,10 +381,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
381 | } | 381 | } |
382 | } | 382 | } |
383 | } | 383 | } |
384 | 384 | ||
385 | GDIDraw(data, graph, altDataDelim, out reuseable); | 385 | GDIDraw(data, graph, altDataDelim, out reuseable); |
386 | } | 386 | } |
387 | 387 | ||
388 | byte[] imageJ2000 = new byte[0]; | 388 | byte[] imageJ2000 = new byte[0]; |
389 | 389 | ||
390 | // This code exists for testing purposes, please do not remove. | 390 | // This code exists for testing purposes, please do not remove. |
@@ -394,7 +394,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
394 | // imageJ2000 = s_asset2Data; | 394 | // imageJ2000 = s_asset2Data; |
395 | // | 395 | // |
396 | // s_flipper = !s_flipper; | 396 | // s_flipper = !s_flipper; |
397 | 397 | ||
398 | try | 398 | try |
399 | { | 399 | { |
400 | imageJ2000 = OpenJPEG.EncodeFromImage(bitmap, true); | 400 | imageJ2000 = OpenJPEG.EncodeFromImage(bitmap, true); |
@@ -420,13 +420,13 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
420 | { | 420 | { |
421 | if (graph != null) | 421 | if (graph != null) |
422 | graph.Dispose(); | 422 | graph.Dispose(); |
423 | 423 | ||
424 | if (bitmap != null) | 424 | if (bitmap != null) |
425 | bitmap.Dispose(); | 425 | bitmap.Dispose(); |
426 | } | 426 | } |
427 | } | 427 | } |
428 | } | 428 | } |
429 | 429 | ||
430 | private int parseIntParam(string strInt) | 430 | private int parseIntParam(string strInt) |
431 | { | 431 | { |
432 | int parsed; | 432 | int parsed; |
@@ -440,7 +440,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
440 | // m_log.Debug("Problem with Draw. Please verify parameters." + e.ToString()); | 440 | // m_log.Debug("Problem with Draw. Please verify parameters." + e.ToString()); |
441 | parsed = -1; | 441 | parsed = -1; |
442 | } | 442 | } |
443 | 443 | ||
444 | return parsed; | 444 | return parsed; |
445 | } | 445 | } |
446 | 446 | ||
@@ -572,7 +572,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
572 | graph.DrawString("not an image. Please check URL.", errorFont, | 572 | graph.DrawString("not an image. Please check URL.", errorFont, |
573 | myBrush, new Point(startPoint.X, 12 + startPoint.Y)); | 573 | myBrush, new Point(startPoint.X, 12 + startPoint.Y)); |
574 | } | 574 | } |
575 | 575 | ||
576 | graph.DrawRectangle(drawPen, startPoint.X, startPoint.Y, endPoint.X, endPoint.Y); | 576 | graph.DrawRectangle(drawPen, startPoint.X, startPoint.Y, endPoint.X, endPoint.Y); |
577 | } | 577 | } |
578 | } | 578 | } |
@@ -638,11 +638,11 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
638 | { | 638 | { |
639 | nextLine = nextLine.Remove(0, 8); | 639 | nextLine = nextLine.Remove(0, 8); |
640 | nextLine = nextLine.Trim(); | 640 | nextLine = nextLine.Trim(); |
641 | 641 | ||
642 | string[] fprops = nextLine.Split(partsDelimiter); | 642 | string[] fprops = nextLine.Split(partsDelimiter); |
643 | foreach (string prop in fprops) | 643 | foreach (string prop in fprops) |
644 | { | 644 | { |
645 | 645 | ||
646 | switch (prop) | 646 | switch (prop) |
647 | { | 647 | { |
648 | case "B": | 648 | case "B": |
@@ -717,7 +717,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
717 | else if (cap[0].ToLower() != "both") | 717 | else if (cap[0].ToLower() != "both") |
718 | return; | 718 | return; |
719 | string type = cap[1].ToLower(); | 719 | string type = cap[1].ToLower(); |
720 | 720 | ||
721 | if (end) | 721 | if (end) |
722 | { | 722 | { |
723 | switch (type) | 723 | switch (type) |
@@ -760,7 +760,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
760 | nextLine = nextLine.Remove(0, 9); | 760 | nextLine = nextLine.Remove(0, 9); |
761 | nextLine = nextLine.Trim(); | 761 | nextLine = nextLine.Trim(); |
762 | int hex = 0; | 762 | int hex = 0; |
763 | 763 | ||
764 | Color newColor; | 764 | Color newColor; |
765 | if (Int32.TryParse(nextLine, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out hex)) | 765 | if (Int32.TryParse(nextLine, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out hex)) |
766 | { | 766 | { |
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs index e1c0cd7..660e03f 100644 --- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | |||
@@ -417,7 +417,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm | |||
417 | continue; | 417 | continue; |
418 | if (m_scene.GetSceneObjectPart(liHostID) == null) | 418 | if (m_scene.GetSceneObjectPart(liHostID) == null) |
419 | continue; | 419 | continue; |
420 | 420 | ||
421 | if (targets.Contains(liHostID)) | 421 | if (targets.Contains(liHostID)) |
422 | QueueMessage(new ListenerInfo(li, name, id, msg)); | 422 | QueueMessage(new ListenerInfo(li, name, id, msg)); |
423 | } | 423 | } |
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs index 87f4277..aed1372 100644 --- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs | |||
@@ -621,7 +621,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC | |||
621 | private Thread httpThread; | 621 | private Thread httpThread; |
622 | public int Idata; | 622 | public int Idata; |
623 | private UUID _itemID; | 623 | private UUID _itemID; |
624 | public UUID ItemID | 624 | public UUID ItemID |
625 | { | 625 | { |
626 | get { return _itemID; } | 626 | get { return _itemID; } |
627 | set { _itemID = value; } | 627 | set { _itemID = value; } |
@@ -633,7 +633,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC | |||
633 | set { _localID = value; } | 633 | set { _localID = value; } |
634 | } | 634 | } |
635 | private UUID _reqID; | 635 | private UUID _reqID; |
636 | public UUID ReqID | 636 | public UUID ReqID |
637 | { | 637 | { |
638 | get { return _reqID; } | 638 | get { return _reqID; } |
639 | set { _reqID = value; } | 639 | set { _reqID = value; } |