From 190bdc8a2e8fa842759087749592769f951834ab Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey Date: Wed, 5 Aug 2009 17:33:23 +0100 Subject: * Remove some mono compiler warnings --- OpenSim/Framework/AvatarAppearance.cs | 3 +-- .../Communications/Tests/LoginServiceTests.cs | 4 +-- .../ClientStack/LindenUDP/LLPacketHandler.cs | 4 +-- .../TextureDownload/UserTextureDownloadService.cs | 29 +++++++++++----------- .../CoreModules/Scripting/LSLHttp/UrlModule.cs | 6 ++--- OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 3 ++- .../Shared/Api/Implementation/LSL_Api.cs | 2 +- .../Freeswitch/FreeswitchServerGetHandler.cs | 4 +-- .../FreeswitchService/FreeswitchService.cs | 4 +-- 9 files changed, 28 insertions(+), 31 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 0b9ea42..6a07bc9 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs @@ -38,8 +38,7 @@ namespace OpenSim.Framework { public class AvatarAppearance { - private static readonly ILog m_log - = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // these are guessed at by the list here - // http://wiki.secondlife.com/wiki/Avatar_Appearance. We'll diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs index 4070b49..47e0293 100644 --- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs @@ -90,8 +90,8 @@ namespace OpenSim.Framework.Communications.Tests TestHelper.InMethod(); // We want to use our own LoginService for this test, one that // doesn't require authentication. - LoginService loginService = new LLStandaloneLoginService((UserManagerBase)m_commsManager.UserService, "Hello folks", new TestInventoryService(), - m_commsManager.NetworkServersInfo, false, new LibraryRootFolder(String.Empty), m_regionConnector); + new LLStandaloneLoginService((UserManagerBase)m_commsManager.UserService, "Hello folks", new TestInventoryService(), + m_commsManager.NetworkServersInfo, false, new LibraryRootFolder(String.Empty), m_regionConnector); Hashtable loginParams = new Hashtable(); loginParams["first"] = m_firstName; diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs index fad9218..eaf8f60 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs @@ -827,9 +827,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP sendbuffer.Length, SocketFlags.None, m_Client.CircuitCode); } } - catch (NullReferenceException n) + catch (NullReferenceException) { - m_log.Debug("[PACKET] Detected reuse of a returned packet"); + m_log.Error("[PACKET]: Detected reuse of a returned packet"); m_PacketQueue.Cancel(item.Sequence); return; } diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs index 5be2a65..65138e2 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs @@ -45,8 +45,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload /// public class UserTextureDownloadService { - private static readonly ILog m_log - = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); /// /// True if the service has been closed, probably because a user with texture requests still queued @@ -88,13 +87,13 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload /// XXX This is really a temporary solution to deal with the situation where a client continually requests /// the same missing textures /// - private readonly IRequestLimitStrategy missingTextureLimitStrategy - = new RepeatLimitStrategy(MAX_ALLOWED_TEXTURE_REQUESTS); +// private readonly IRequestLimitStrategy missingTextureLimitStrategy +// = new RepeatLimitStrategy(MAX_ALLOWED_TEXTURE_REQUESTS); public UserTextureDownloadService( IClientAPI client, Scene scene, OpenSim.Framework.BlockingQueue sharedQueue) { - m_client = client; +// m_client = client; m_scene = scene; m_sharedSendersQueue = sharedQueue; } @@ -231,16 +230,16 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload /// Place a ready texture sender on the processing queue. /// /// - private void EnqueueTextureSender(ITextureSender textureSender) - { - textureSender.Cancel = false; - textureSender.Sending = true; - - if (!m_sharedSendersQueue.Contains(textureSender)) - { - m_sharedSendersQueue.Enqueue(textureSender); - } - } +// private void EnqueueTextureSender(ITextureSender textureSender) +// { +// textureSender.Cancel = false; +// textureSender.Sending = true; +// +// if (!m_sharedSendersQueue.Contains(textureSender)) +// { +// m_sharedSendersQueue.Enqueue(textureSender); +// } +// } /// /// Close this module. diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index 7082e85..ad42523 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs @@ -60,9 +60,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp public class UrlModule : ISharedRegionModule, IUrlModule { - private static readonly ILog m_log = - LogManager.GetLogger( - MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = +// LogManager.GetLogger( +// MethodBase.GetCurrentMethod().DeclaringType); private Dictionary m_RequestMap = new Dictionary(); diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index 83db396..9805ff5 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs @@ -2863,7 +2863,8 @@ namespace OpenSim.Region.Physics.OdePlugin //if ((framecount % m_randomizeWater) == 0) // randomizeWater(waterlevel); - int RayCastTimeMS = m_rayCastManager.ProcessQueuedRequests(); + //int RayCastTimeMS = m_rayCastManager.ProcessQueuedRequests(); + m_rayCastManager.ProcessQueuedRequests(); collision_optimized(timeStep); diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index acab734..7f691ba 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -9033,7 +9033,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api if (m.Success) { for (int i = 1; i < gnums.Length; i++) { System.Text.RegularExpressions.Group g = m.Groups[gnums[i]]; - CaptureCollection cc = g.Captures; + //CaptureCollection cc = g.Captures; } if (m.Groups.Count == 5) { httpHeaders["Authorization"] = String.Format("Basic {0}", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(m.Groups[2].ToString() + ":" + m.Groups[3].ToString()))); diff --git a/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerGetHandler.cs b/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerGetHandler.cs index c2a64b8..8b41742 100644 --- a/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerGetHandler.cs +++ b/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerGetHandler.cs @@ -46,12 +46,12 @@ namespace OpenSim.Server.Handlers.Freeswitch { // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private IFreeswitchService m_FreeswitchService; + //private IFreeswitchService m_FreeswitchService; public FreeswitchServerGetHandler(IFreeswitchService service) : base("GET", "/api") { - m_FreeswitchService = service; + //m_FreeswitchService = service; } public override byte[] Handle(string path, Stream request, diff --git a/OpenSim/Services/FreeswitchService/FreeswitchService.cs b/OpenSim/Services/FreeswitchService/FreeswitchService.cs index 84674ec..0a38300 100644 --- a/OpenSim/Services/FreeswitchService/FreeswitchService.cs +++ b/OpenSim/Services/FreeswitchService/FreeswitchService.cs @@ -38,9 +38,7 @@ namespace OpenSim.Services.FreeswitchService { public class FreeswitchService : FreeswitchServiceBase, IFreeswitchService { - private static readonly ILog m_log = - LogManager.GetLogger( - MethodBase.GetCurrentMethod().DeclaringType); + //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public FreeswitchService(IConfigSource config) : base(config) { -- cgit v1.1