From e5ef993f2b7ee8b7777d8a413d815c3e8e2ca786 Mon Sep 17 00:00:00 2001 From: Tom Date: Mon, 31 Jan 2011 18:01:53 -0800 Subject: [PATCH 1/6] Fix cm/15627 : Don't block the entire URL on duplicate requests, just that particular request! --- OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index 4851b33dbe..89f5da3d9d 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs @@ -48,7 +48,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp public string url; public UUID urlcode; public Dictionary requests; - public bool responseSent; } public class RequestData @@ -61,6 +60,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp //public ManualResetEvent ev; public bool requestDone; public int startTime; + public bool responseSent; public string uri; } @@ -200,13 +200,13 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp if (m_RequestMap.ContainsKey(request)) { UrlData urlData = m_RequestMap[request]; - if (!urlData.responseSent) + if (!urlData.requests[request].responseSent) { urlData.requests[request].responseCode = status; urlData.requests[request].responseBody = body; //urlData.requests[request].ev.Set(); urlData.requests[request].requestDone = true; - urlData.responseSent = true; + urlData.requests[request].responseSent = true; } } else From ba39d9f0e65bc43a891871fcddae997ff2e85b31 Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 2 Feb 2011 03:10:39 +0100 Subject: [PATCH 2/6] Squash a nullref --- OpenSim/Region/Framework/Scenes/Scene.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c65a82be7b..2424194ad5 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -2555,6 +2555,8 @@ namespace OpenSim.Region.Framework.Scenes { */ UserAccount uac = UserAccountService.GetUserAccount(RegionInfo.ScopeID, user); + if (uac == null) + return 0; return uac.UserFlags; //} } From 4a56038d11a82cb9b6a0e11cfe935e6c52948bd2 Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 2 Feb 2011 03:28:47 +0100 Subject: [PATCH 3/6] Change the timeout on WebUtil to 20s to help make more tps succeed --- OpenSim/Framework/WebUtil.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index d731ac5882..05933419b9 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs @@ -138,17 +138,17 @@ namespace OpenSim.Framework /// public static OSDMap PutToService(string url, OSDMap data) { - return ServiceOSDRequest(url,data,"PUT",10000); + return ServiceOSDRequest(url,data,"PUT",20000); } public static OSDMap PostToService(string url, OSDMap data) { - return ServiceOSDRequest(url,data,"POST",10000); + return ServiceOSDRequest(url,data,"POST",20000); } public static OSDMap GetFromService(string url) { - return ServiceOSDRequest(url,null,"GET",10000); + return ServiceOSDRequest(url,null,"GET",20000); } public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout) @@ -275,7 +275,7 @@ namespace OpenSim.Framework /// public static OSDMap PostToService(string url, NameValueCollection data) { - return ServiceFormRequest(url,data,10000); + return ServiceFormRequest(url,data,20000); } public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout) From 722ae4f031738350be03ccd299b240acfe8d5b9d Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 2 Feb 2011 20:22:03 +0100 Subject: [PATCH 4/6] Add a missing constand and fix ToDoubleList to not eat the last memeber --- OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 1 + OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index 93d544b5cf..c2fe691d66 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs @@ -373,6 +373,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase public const int PRIM_SCULPT_TYPE_TORUS = 2; public const int PRIM_SCULPT_TYPE_PLANE = 3; public const int PRIM_SCULPT_TYPE_CYLINDER = 4; + public const int PRIM_SCULPT_FLAG_INVERT = 64; public const int MASK_BASE = 0; public const int MASK_OWNER = 1; diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs index f810fd8250..665f4a677c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs +++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs @@ -1058,7 +1058,7 @@ namespace OpenSim.Region.ScriptEngine.Shared { list ret = new list(); double entry; - for (int i = 0; i < src.Data.Length - 1; i++) + for (int i = 0; i < src.Data.Length; i++) { if (double.TryParse(src.Data[i].ToString(), NumberStyles.Float, Culture.NumberFormatInfo, out entry)) { From 595891409cbfaca670d23e0f37710eabe6b648bd Mon Sep 17 00:00:00 2001 From: Melanie Date: Wed, 2 Feb 2011 21:45:37 +0100 Subject: [PATCH 5/6] Add another flag --- OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index c2fe691d66..c31e5d3092 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs @@ -374,6 +374,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase public const int PRIM_SCULPT_TYPE_PLANE = 3; public const int PRIM_SCULPT_TYPE_CYLINDER = 4; public const int PRIM_SCULPT_FLAG_INVERT = 64; + public const int PRIM_SCULPT_FLAG_MIRROR = 128; public const int MASK_BASE = 0; public const int MASK_OWNER = 1; From 9a9c9644acb4135d168b239f40fd07aafe34f190 Mon Sep 17 00:00:00 2001 From: Tom Date: Thu, 3 Feb 2011 17:25:55 -0800 Subject: [PATCH 6/6] Repair x-query-string --- OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index 89f5da3d9d..66eb7473a0 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs @@ -444,7 +444,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp if (request.ContainsKey(key)) { string val = (String)request[key]; - if (key == "") + if (key != "") { queryString = queryString + key + "=" + val + "&"; }