From 14b4d8bad796527a05a5f5992d1a1df1c5c43e6f Mon Sep 17 00:00:00 2001 From: Oren Hurvitz Date: Fri, 31 Jul 2015 18:13:39 +0300 Subject: [PATCH] Eliminated several warnings --- .../Handlers/FetchInventory/FetchInvDescHandler.cs | 7 +++++-- .../Scripting/HttpRequest/ScriptsHttpRequests.cs | 2 ++ .../HttpRequest/Tests/ScriptsHttpRequestsTests.cs | 2 ++ .../OptionalModules/Scripting/Minimodule/MRMModule.cs | 2 ++ OpenSim/Region/Physics/BulletSPlugin/Tests/HullCreation.cs | 1 - OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs | 2 ++ .../Server/Handlers/Hypergrid/UserAgentServerConnector.cs | 2 ++ 7 files changed, 15 insertions(+), 3 deletions(-) diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs index 5c7a3dfd46..7197049f16 100644 --- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs +++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs @@ -128,7 +128,9 @@ namespace OpenSim.Capabilities.Handlers if (invcollSet == null) { m_log.DebugFormat("[WEB FETCH INV DESC HANDLER]: Multiple folder fetch failed. Trying old protocol."); +#pragma warning disable 0612 return FetchInventoryDescendentsRequest(foldersrequested, httpRequest, httpResponse); +#pragma warning restore 0612 } string inventoryitemstr = string.Empty; @@ -199,10 +201,11 @@ namespace OpenSim.Capabilities.Handlers int version = 0; int descendents = 0; - inv - = Fetch( +#pragma warning disable 0612 + inv = Fetch( invFetch.owner_id, invFetch.folder_id, invFetch.owner_id, invFetch.fetch_folders, invFetch.fetch_items, invFetch.sort_order, out version, out descendents); +#pragma warning restore 0612 if (inv != null && inv.Folders != null) { diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs index 8f6aa55923..b1f3f9bc8a 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 28fd49527d..d22487e6f5 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 6fb28e2d1b..4bafe2f056 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 36513511e0..5a5de110b4 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() diff --git a/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs index 06eaf2ec8d..dac4ca85dc 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs @@ -44,7 +44,9 @@ namespace OpenSim.Server.Handlers.Hypergrid public HeloServiceInConnector(IConfigSource config, IHttpServer server, string configName) : base(config, server, configName) { +#pragma warning disable 0612 server.AddStreamHandler(new HeloServerGetHandler("opensim-robust")); +#pragma warning restore 0612 server.AddStreamHandler(new HeloServerHeadHandler("opensim-robust")); } } diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs index 15b5b31aa1..e112e0e1ff 100644 --- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs @@ -99,8 +99,10 @@ namespace OpenSim.Server.Handlers.Hypergrid server.AddXmlRPCHandler("verify_client", VerifyClient, false); server.AddXmlRPCHandler("logout_agent", LogoutAgent, false); +#pragma warning disable 0612 server.AddXmlRPCHandler("status_notification", StatusNotification, false); server.AddXmlRPCHandler("get_online_friends", GetOnlineFriends, false); +#pragma warning restore 0612 server.AddXmlRPCHandler("get_user_info", GetUserInfo, false); server.AddXmlRPCHandler("get_server_urls", GetServerURLs, false);