From 97323345ee7953258c6902138c50265eac39c319 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 26 Sep 2008 15:28:14 +0000 Subject: * minor: remove warnings --- .../Agent/AssetTransaction/AgentAssetTransactionsManager.cs | 8 ++++---- .../Modules/Agent/AssetTransaction/AssetXferUploader.cs | 4 ---- OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs | 8 ++++---- 3 files changed, 8 insertions(+), 12 deletions(-) (limited to 'OpenSim/Region/Environment') diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs index 8d422aa..be8aeea 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs @@ -26,8 +26,8 @@ */ using System.Collections.Generic; -using System.Reflection; -using log4net; +//using System.Reflection; +//using log4net; using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Environment.Scenes; @@ -37,8 +37,8 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction { public class AgentAssetTransactionsManager { - private static readonly ILog m_log - = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + //private static readonly ILog m_log + // = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); /// /// Each agent has its own singleton collection of transactions diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs index 9c0888a..5484ad5 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs @@ -55,7 +55,6 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction private IClientAPI ourClient; private UUID TransactionID = UUID.Zero; private sbyte type = 0; - private bool UploadComplete; private byte wearableType = 0; public ulong XferID; @@ -140,15 +139,12 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction protected void RequestStartXfer() { - UploadComplete = false; XferID = Util.GetNextXferID(); ourClient.SendXferRequest(XferID, m_asset.Type, m_asset.FullID, 0, new byte[0]); } protected void SendCompleteMessage() { - UploadComplete = true; - ourClient.SendAssetUploadCompleteMessage(m_asset.Type, true, m_asset.FullID); m_finished = true; diff --git a/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs b/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs index d7bc42f..fced389 100644 --- a/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs @@ -140,10 +140,10 @@ namespace OpenSim.Region.Environment.Modules //m_log.Debug("[WIND]:Regenerating..."); GenWindPos(); // Generate shared values once - int spotxp = 0; - int spotyp = 0; - int spotxm = 0; - int spotym = 0; + //int spotxp = 0; + //int spotyp = 0; + //int spotxm = 0; + //int spotym = 0; List avatars = m_scene.GetAvatars(); foreach (ScenePresence avatar in avatars) { -- cgit v1.1