diff options
Diffstat (limited to 'OpenSim/Region')
4 files changed, 6 insertions, 1 deletions
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 | |||
139 | return false; | 139 | return false; |
140 | 140 | ||
141 | // Check for policy and execute it if defined | 141 | // Check for policy and execute it if defined |
142 | #pragma warning disable 0618 | ||
142 | if (ServicePointManager.CertificatePolicy != null) | 143 | if (ServicePointManager.CertificatePolicy != null) |
143 | { | 144 | { |
144 | return ServicePointManager.CertificatePolicy.CheckValidationResult (sp, certificate, Request, 0); | 145 | return ServicePointManager.CertificatePolicy.CheckValidationResult (sp, certificate, Request, 0); |
145 | } | 146 | } |
147 | #pragma warning restore 0618 | ||
146 | 148 | ||
147 | return true; | 149 | return true; |
148 | } | 150 | } |
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 | |||
96 | { | 96 | { |
97 | public string Response { get; set; } | 97 | public string Response { get; set; } |
98 | 98 | ||
99 | #pragma warning disable 0618 | ||
99 | public TestHttpWebResponse(SerializationInfo serializationInfo, StreamingContext streamingContext) | 100 | public TestHttpWebResponse(SerializationInfo serializationInfo, StreamingContext streamingContext) |
100 | : base(serializationInfo, streamingContext) {} | 101 | : base(serializationInfo, streamingContext) {} |
102 | #pragma warning restore 0618 | ||
101 | 103 | ||
102 | public override Stream GetResponseStream() | 104 | public override Stream GetResponseStream() |
103 | { | 105 | { |
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 | |||
180 | /// * Internet | 180 | /// * Internet |
181 | /// * Everything | 181 | /// * Everything |
182 | /// </remarks> | 182 | /// </remarks> |
183 | #pragma warning disable 0618 | ||
183 | public static AppDomain CreateRestrictedDomain(string permissionSetName, string appDomainName) | 184 | public static AppDomain CreateRestrictedDomain(string permissionSetName, string appDomainName) |
184 | { | 185 | { |
185 | if (permissionSetName == null) | 186 | if (permissionSetName == null) |
@@ -240,6 +241,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule | |||
240 | 241 | ||
241 | return restrictedDomain; | 242 | return restrictedDomain; |
242 | } | 243 | } |
244 | #pragma warning restore 0618 | ||
243 | 245 | ||
244 | 246 | ||
245 | void EventManager_OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource) | 247 | 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 | |||
50 | 50 | ||
51 | BSScene PhysicsScene { get; set; } | 51 | BSScene PhysicsScene { get; set; } |
52 | Vector3 ObjectInitPosition; | 52 | Vector3 ObjectInitPosition; |
53 | float simulationTimeStep = 0.089f; | ||
54 | 53 | ||
55 | [TestFixtureSetUp] | 54 | [TestFixtureSetUp] |
56 | public void Init() | 55 | public void Init() |