From 5815162d7ef1df861de082cee9e99cec14805572 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 15 Jul 2009 20:49:58 +0000 Subject: minor: remove some mono compiler warnings --- OpenSim/Framework/RegionInfo.cs | 4 ++-- .../Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs | 3 +-- OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs | 2 +- .../Neighbour/RemoteNeighourServiceConnector.cs | 4 ++-- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 -- OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs | 2 +- OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs | 2 +- OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs | 2 +- .../OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs | 8 ++++---- OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs | 2 +- .../Inventory/QuickAndDirtyInventoryServiceConnector.cs | 8 ++++---- 11 files changed, 18 insertions(+), 21 deletions(-) diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 8f9b551..2f7faff 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs @@ -427,7 +427,7 @@ namespace OpenSim.Framework if (name == String.Empty) throw new Exception("Cannot interactively create region with no name"); - IConfig newRegion = source.AddConfig(name); + source.AddConfig(name); creatingNew = true; } @@ -437,7 +437,7 @@ namespace OpenSim.Framework if (source.Configs[name] == null) { - IConfig newRegion = source.AddConfig(name); + source.AddConfig(name); creatingNew = true; } diff --git a/OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs index fed4707..1026248 100644 --- a/OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs +++ b/OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs @@ -93,10 +93,9 @@ namespace OpenSim.Framework.Servers.Tests [Test] public void TestHandleFetchMissingAsset() { - IAssetCache assetCache = new TestAssetCache(); CachedGetAssetStreamHandler handler; OSHttpResponse response; - AssetBase asset = CreateTestEnvironment(out handler, out response); + CreateTestEnvironment(out handler, out response); GetAssetStreamHandlerTestHelpers.BaseFetchMissingAsset(handler, response); } diff --git a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs index afb4a65..35da73f 100644 --- a/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs +++ b/OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs @@ -96,7 +96,7 @@ namespace OpenSim.Framework.Servers.Tests { GetAssetStreamHandler handler; OSHttpResponse response; - AssetBase asset = CreateTestEnvironment(out handler, out response); + CreateTestEnvironment(out handler, out response); GetAssetStreamHandlerTestHelpers.BaseFetchMissingAsset(handler, response); } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs index 01c95d7..6c3a025 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs @@ -48,8 +48,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour private bool m_Enabled = false; private LocalNeighbourServicesConnector m_LocalService; - private string serviceDll; - private List m_Scenes = new List(); + //private string serviceDll; + //private List m_Scenes = new List(); public Type ReplacableInterface { diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 56369f5..296c554 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -145,8 +145,6 @@ namespace OpenSim.Region.Framework.Scenes private Vector3 m_lastVelocity = Vector3.Zero; - private int m_maxPrimsPerFrame = 200; - // Default AV Height private float m_avHeight = 127.0f; diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs index 87bd20e..f6737a5 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs @@ -74,7 +74,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests [Test] public void TestConstructor() { - SceneBase scene = new SceneBaseImpl(); + new SceneBaseImpl(); } } } diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs index d18545b..1c9bce4 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs @@ -132,7 +132,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests RegionInfo regionInfo = new RegionInfo(0,0,null,null); FakeStorageManager storageManager = new FakeStorageManager(); - Scene scene = new Scene(regionInfo, null, null, null, storageManager, null, false, false, false, null, null); + new Scene(regionInfo, null, null, null, storageManager, null, false, false, false, null, null); } } } diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs index 8a38f01..ce2d339 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatar.cs @@ -42,7 +42,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule { private readonly Scene m_rootScene; private readonly UUID m_ID; - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public SPAvatar(Scene scene, UUID ID) { diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs index 971119f..9b684fe 100644 --- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs +++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SPAvatarAttachment.cs @@ -35,17 +35,17 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule public class SPAvatarAttachment : IAvatarAttachment { private readonly Scene m_rootScene; - private readonly IAvatar m_parent; + //private readonly IAvatar m_parent; private readonly int m_location; - private readonly UUID m_itemId; + //private readonly UUID m_itemId; private readonly UUID m_assetId; public SPAvatarAttachment(Scene rootScene, IAvatar self, int location, UUID itemId, UUID assetId) { m_rootScene = rootScene; - m_parent = self; + //m_parent = self; m_location = location; - m_itemId = itemId; + //m_itemId = itemId; m_assetId = assetId; } diff --git a/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs b/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs index 2615358..04a73e4 100644 --- a/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs +++ b/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs @@ -46,7 +46,7 @@ namespace OpenSim.Server.Handlers.Tests.Asset { TestHelper.InMethod(); - AssetServerGetHandler handler = new AssetServerGetHandler(null); + new AssetServerGetHandler(null); } [Test] diff --git a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs index e95b83d..6a93c04 100644 --- a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs @@ -43,13 +43,13 @@ namespace OpenSim.Services.Connectors /// public class QuickAndDirtyInventoryServiceConnector : IInventoryService { - private static readonly ILog m_log = - LogManager.GetLogger( - MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = +// LogManager.GetLogger( +// MethodBase.GetCurrentMethod().DeclaringType); private string m_ServerURI = String.Empty; - private Dictionary m_RequestingInventory = new Dictionary(); + //private Dictionary m_RequestingInventory = new Dictionary(); public QuickAndDirtyInventoryServiceConnector() { -- cgit v1.1