From 05756e1fb96aa47f9ff111dd04499934c7077731 Mon Sep 17 00:00:00 2001 From: "dr scofield (aka dirk husemann)" Date: Wed, 2 Sep 2009 09:43:22 +0200 Subject: [PATCH] warnings safari. --- .../Tests/Cache/UserProfileCacheServiceTests.cs | 2 +- .../Inventory/Archiver/Tests/InventoryArchiverTests.cs | 7 +++---- OpenSim/Region/CoreModules/World/Land/LandObject.cs | 2 ++ .../CoreModules/World/Land/RegionCombinerModule.cs | 4 ++-- .../Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | 4 ++-- OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs | 10 +++++----- OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 2 +- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs index 2bb0926bb6..e5d8895d9d 100644 --- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs @@ -66,7 +66,7 @@ namespace OpenSim.Framework.Communications.Tests CachedUserInfo nonExistingUserInfo; TestCommunicationsManager commsManager = new TestCommunicationsManager(); - Scene myScene = SceneSetupHelpers.SetupScene(commsManager, ""); + // Scene myScene = SceneSetupHelpers.SetupScene(commsManager, ""); // Check we can't retrieve info before it exists by uuid nonExistingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(userId); diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index 1696d82587..066c5d3c45 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs @@ -93,13 +93,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests string userFirstName = "Jock"; string userLastName = "Stirrup"; UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020"); - CachedUserInfo userInfo; + // CachedUserInfo userInfo; lock (this) { - userInfo - = UserProfileTestUtils.CreateUserWithInventory( - cm, userFirstName, userLastName, userId, InventoryReceived); + UserProfileTestUtils.CreateUserWithInventory( + cm, userFirstName, userLastName, userId, InventoryReceived); Monitor.Wait(this, 60000); } diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index bb06996592..2701f607ba 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs @@ -44,7 +44,9 @@ namespace OpenSim.Region.CoreModules.World.Land #region Member Variables private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + #pragma warning disable 0429 private const int landArrayMax = ((int)((int)Constants.RegionSize / 4) >= 64) ? (int)((int)Constants.RegionSize / 4) : 64; + #pragma warning restore 0429 private bool[,] m_landBitmap = new bool[landArrayMax,landArrayMax]; protected LandData m_landData = new LandData(); diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs index 6a5317b387..c525227d17 100644 --- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs @@ -658,8 +658,8 @@ namespace OpenSim.Region.CoreModules.World.Land public class LargeLandChannel : ILandChannel { - private static readonly ILog m_log = - LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + // private static readonly ILog m_log = + // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private RegionData RegData; private ILandChannel RootRegionLandChannel; private readonly List RegionConnections; diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index faa0157acc..65c5274a57 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs @@ -85,7 +85,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice private static string m_freeSwitchRealm; private static string m_freeSwitchSIPProxy; private static bool m_freeSwitchAttemptUseSTUN; - private static string m_freeSwitchSTUNServer; + // private static string m_freeSwitchSTUNServer; private static string m_freeSwitchEchoServer; private static int m_freeSwitchEchoPort; private static string m_freeSwitchDefaultWellKnownIP; @@ -144,7 +144,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice m_freeSwitchRealm = m_config.GetString("freeswitch_realm", String.Empty); m_freeSwitchSIPProxy = m_config.GetString("freeswitch_sip_proxy", m_freeSwitchRealm); m_freeSwitchAttemptUseSTUN = m_config.GetBoolean("freeswitch_attempt_stun", true); - m_freeSwitchSTUNServer = m_config.GetString("freeswitch_stun_server", m_freeSwitchRealm); + // m_freeSwitchSTUNServer = m_config.GetString("freeswitch_stun_server", m_freeSwitchRealm); m_freeSwitchEchoServer = m_config.GetString("freeswitch_echo_server", m_freeSwitchRealm); m_freeSwitchEchoPort = m_config.GetInt("freeswitch_echo_port", 50505); m_freeSwitchDefaultWellKnownIP = m_config.GetString("freeswitch_well_known_ip", m_freeSwitchRealm); diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs index d404344dec..4313c968b1 100644 --- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs +++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs @@ -43,11 +43,11 @@ namespace OpenSim.Tests.Common.Mock } private IUserDataPlugin m_userDataPlugin; - public IInventoryDataPlugin InventoryDataPlugin - { - get { return m_inventoryDataPlugin; } - } - private IInventoryDataPlugin m_inventoryDataPlugin; + // public IInventoryDataPlugin InventoryDataPlugin + // { + // get { return m_inventoryDataPlugin; } + // } + // private IInventoryDataPlugin m_inventoryDataPlugin; public TestCommunicationsManager() : this(null) diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index 360e6b1cb1..0d8baadec5 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs @@ -163,7 +163,7 @@ namespace OpenSim.Tests.Common.Setup godsModule.Initialise(testScene, new IniConfigSource()); testScene.AddModule(godsModule.Name, godsModule); realServices = realServices.ToLower(); - IConfigSource config = new IniConfigSource(); + // IConfigSource config = new IniConfigSource(); // If we have a brand new scene, need to initialize shared region modules if ((m_assetService == null && m_inventoryService == null) || newScene)