From feb30217de48f4b3d869bf13453a945a04ee2524 Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Fri, 27 Jun 2008 16:58:21 +0000 Subject: dr scofield's warning safari: * commented out [Obsolete(....)] attributes where no replacement feature was available: if we want to attribute code that we think needs to be reworked, we should define a new attribute and use that instead (together with a little tool to retrieve all the attributed code then) * commenting out unused variables --- OpenSim/Framework/Communications/Capabilities/Caps.cs | 10 +++++----- OpenSim/Framework/Communications/CommunicationsManager.cs | 2 +- OpenSim/Framework/Communications/LoginResponse.cs | 6 +++--- OpenSim/Framework/Communications/RestClient.cs | 9 +++++---- OpenSim/Framework/Communications/XMPP/XmppSerializer.cs | 4 ++-- 5 files changed, 16 insertions(+), 15 deletions(-) (limited to 'OpenSim/Framework/Communications') diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 5249aa2..5aba086 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs @@ -79,17 +79,17 @@ namespace OpenSim.Framework.Communications.Capabilities private CapsHandlers m_capsHandlers; private static readonly string m_requestPath = "0000/"; - private static readonly string m_mapLayerPath = "0001/"; + // private static readonly string m_mapLayerPath = "0001/"; private static readonly string m_newInventory = "0002/"; //private static readonly string m_requestTexture = "0003/"; private static readonly string m_notecardUpdatePath = "0004/"; private static readonly string m_notecardTaskUpdatePath = "0005/"; - private static readonly string m_fetchInventoryPath = "0006/"; + // private static readonly string m_fetchInventoryPath = "0006/"; // The following two entries are in a module, however, there also here so that we don't re-assign // the path to another cap by mistake. - private static readonly string m_parcelVoiceInfoRequestPath = "0007/"; // This is in a module. - private static readonly string m_provisionVoiceAccountRequestPath = "0008/";// This is in a module. + // private static readonly string m_parcelVoiceInfoRequestPath = "0007/"; // This is in a module. + // private static readonly string m_provisionVoiceAccountRequestPath = "0008/";// This is in a module. //private string eventQueue = "0100/"; private BaseHttpServer m_httpListener; @@ -246,7 +246,7 @@ namespace OpenSim.Framework.Communications.Capabilities // multiple fetch-folder maps are allowed within the larger folders map. public string FetchInventoryRequest(string request, string path, string param) { - string unmodifiedRequest = request.ToString(); + // string unmodifiedRequest = request.ToString(); //m_log.DebugFormat("[AGENT INVENTORY]: Received CAPS fetch inventory request {0}", unmodifiedRequest); m_log.Debug("[CAPS]: Inventory Request in region: " + m_regionName); diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index e8353b4..5de0c71 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs @@ -282,7 +282,7 @@ namespace OpenSim.Framework.Communications if (profileData != null) { returnstring = new string[2]; - LLUUID profileId = profileData.ID; + // LLUUID profileId = profileData.ID; returnstring[0] = profileData.FirstName; returnstring[1] = profileData.SurName; lock (m_nameRequestCache) diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs index 6fdd06a..113e3f0 100644 --- a/OpenSim/Framework/Communications/LoginResponse.cs +++ b/OpenSim/Framework/Communications/LoginResponse.cs @@ -95,7 +95,7 @@ namespace OpenSim.Framework.Communications // Response private XmlRpcResponse xmlRpcResponse; - private XmlRpcResponse defaultXmlRpcResponse; + // private XmlRpcResponse defaultXmlRpcResponse; private string welcomeMessage; private string startLocation; @@ -117,7 +117,7 @@ namespace OpenSim.Framework.Communications loginError = new Hashtable(); uiConfigHash = new Hashtable(); - defaultXmlRpcResponse = new XmlRpcResponse(); + // defaultXmlRpcResponse = new XmlRpcResponse(); userProfile = new UserInfo(); inventoryRoot = new ArrayList(); initialOutfit = new ArrayList(); @@ -126,7 +126,7 @@ namespace OpenSim.Framework.Communications inventoryLibraryOwner = new ArrayList(); xmlRpcResponse = new XmlRpcResponse(); - defaultXmlRpcResponse = new XmlRpcResponse(); + // defaultXmlRpcResponse = new XmlRpcResponse(); SetDefaultValues(); } diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs index f6c33a8..b71a590 100644 --- a/OpenSim/Framework/Communications/RestClient.cs +++ b/OpenSim/Framework/Communications/RestClient.cs @@ -58,7 +58,7 @@ namespace OpenSim.Framework.Communications { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private string realuri; + // private string realuri; #region member variables @@ -229,7 +229,7 @@ namespace OpenSim.Framework.Communications sb.Append(kv.Value); } } - realuri = sb.ToString(); + // realuri = sb.ToString(); //m_log.InfoFormat("[REST CLIENT]: RestURL: {0}", realuri); return new Uri(sb.ToString()); } @@ -250,8 +250,9 @@ namespace OpenSim.Framework.Communications if (read > 0) { _resource.Write(_readbuf, 0, read); - IAsyncResult asynchronousResult = - s.BeginRead(_readbuf, 0, BufferSize, new AsyncCallback(StreamIsReadyDelegate), s); + // IAsyncResult asynchronousResult = + // s.BeginRead(_readbuf, 0, BufferSize, new AsyncCallback(StreamIsReadyDelegate), s); + s.BeginRead(_readbuf, 0, BufferSize, new AsyncCallback(StreamIsReadyDelegate), s); // TODO! Implement timeout, without killing the server //ThreadPool.RegisterWaitForSingleObject(asynchronousResult.AsyncWaitHandle, new WaitOrTimerCallback(TimeoutCallback), _request, DefaultTimeout, true); diff --git a/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs b/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs index 30a9eac..eb9dabe 100644 --- a/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs +++ b/OpenSim/Framework/Communications/XMPP/XmppSerializer.cs @@ -38,8 +38,8 @@ namespace OpenSim.Framework.Communications.XMPP { public class XmppSerializer { - private static readonly ILog _log = - LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + // private static readonly ILog _log = + // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // need to do it this way, as XmlSerializer(type, extratypes) // does not work on mono (at least). -- cgit v1.1