From 14b4d8bad796527a05a5f5992d1a1df1c5c43e6f Mon Sep 17 00:00:00 2001 From: Oren Hurvitz Date: Fri, 31 Jul 2015 18:13:39 +0300 Subject: Eliminated several warnings --- OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | 2 ++ .../CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs | 2 ++ OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs | 2 ++ OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs | 1 - 4 files changed, 6 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs index 8f6aa55..b1f3f9b 100644 --- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs @@ -139,10 +139,12 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest return false; // Check for policy and execute it if defined +#pragma warning disable 0618 if (ServicePointManager.CertificatePolicy != null) { return ServicePointManager.CertificatePolicy.CheckValidationResult (sp, certificate, Request, 0); } +#pragma warning restore 0618 return true; } diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs index 28fd495..d22487e 100644 --- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs +++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/Tests/ScriptsHttpRequestsTests.cs @@ -96,8 +96,10 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest.Tests { public string Response { get; set; } +#pragma warning disable 0618 public TestHttpWebResponse(SerializationInfo serializationInfo, StreamingContext streamingContext) : base(serializationInfo, streamingContext) {} +#pragma warning restore 0618 public override Stream GetResponseStream() { diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs index 6fb28e2..4bafe2f 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs @@ -180,6 +180,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule /// * Internet /// * Everything /// +#pragma warning disable 0618 public static AppDomain CreateRestrictedDomain(string permissionSetName, string appDomainName) { if (permissionSetName == null) @@ -240,6 +241,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule return restrictedDomain; } +#pragma warning restore 0618 void EventManager_OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource) diff --git a/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs b/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs index 3651351..5a5de11 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs @@ -50,7 +50,6 @@ public class HullCreation : OpenSimTestCase BSScene PhysicsScene { get; set; } Vector3 ObjectInitPosition; - float simulationTimeStep = 0.089f; [TestFixtureSetUp] public void Init() -- cgit v1.1