From 41105948bdb21d8f53ad3aeeb8cfdddb8aa7367c Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Fri, 21 Jan 2011 23:19:44 +0000 Subject: [PATCH] remove some mono compiler warnings --- .../Agent/AssetTransaction/AgentAssetsTransactions.cs | 4 ++-- OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs | 5 +++-- .../Assets/NewFileAgentInventoryVariablePriceModule.cs | 5 +++-- OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs | 5 +++-- .../Avatar/ObjectCaps/UploadObjectAssetModule.cs | 6 ++---- .../CoreModules/World/Estate/EstateManagementModule.cs | 6 ++++-- OpenSim/Region/CoreModules/World/Sound/SoundModule.cs | 2 +- OpenSim/Region/CoreModules/World/Warp3DMap/Perlin.cs | 4 +--- 8 files changed, 19 insertions(+), 18 deletions(-) diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs index c66a4ea26b..771038e1af 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs @@ -41,8 +41,8 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction /// public class AgentAssetTransactions { - private static readonly ILog m_log = LogManager.GetLogger( - MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = LogManager.GetLogger( +// MethodBase.GetCurrentMethod().DeclaringType); // Fields private bool m_dumpAssetsToFile; diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs index 8347e35ac9..878242a447 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs @@ -49,8 +49,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] public class GetMeshModule : INonSharedRegionModule { - private static readonly ILog m_log = - LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = +// LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + private Scene m_scene; private IAssetService m_assetService; diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs index 63fad88dd2..542af25b87 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs @@ -50,8 +50,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] public class NewFileAgentInventoryVariablePriceModule : INonSharedRegionModule { - private static readonly ILog m_log = - LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = +// LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + private Scene m_scene; private IAssetService m_assetService; private bool m_dumpAssetsToFile = false; diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs index 008233bf55..a0d72ede22 100644 --- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs +++ b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs @@ -43,8 +43,9 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps { public class ObjectAdd : IRegionModule { - private static readonly ILog m_log = - LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = +// LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + private Scene m_scene; #region IRegionModule Members diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs index e11e2524ce..3114d7ff59 100644 --- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs @@ -174,7 +174,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps Vector3 pos = avatar.AbsolutePosition + (Vector3.UnitX * avatar.Rotation); Quaternion rot = Quaternion.Identity; Vector3 rootpos = Vector3.Zero; - Quaternion rootrot = Quaternion.Identity; +// Quaternion rootrot = Quaternion.Identity; SceneObjectGroup rootGroup = null; SceneObjectGroup[] allparts = new SceneObjectGroup[message.Objects.Length]; @@ -186,11 +186,9 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps if (i == 0) { rootpos = obj.Position; - rootrot = obj.Rotation; - +// rootrot = obj.Rotation; } - // Combine the extraparams data into it's ugly blob again.... //int bytelength = 0; //for (int extparams = 0; extparams < obj.ExtraParams.Length; extparams++) diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index ddae20f21c..b0563c5ff1 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs @@ -767,6 +767,7 @@ namespace OpenSim.Region.CoreModules.World.Estate LookupUUIDS icon = (LookupUUIDS)iar.AsyncState; icon.EndInvoke(iar); } + private void LookupUUID(List uuidLst) { LookupUUIDS d = LookupUUIDsAsync; @@ -775,6 +776,7 @@ namespace OpenSim.Region.CoreModules.World.Estate LookupUUIDSCompleted, d); } + private void LookupUUIDsAsync(List uuidLst) { UUID[] uuidarr; @@ -789,12 +791,12 @@ namespace OpenSim.Region.CoreModules.World.Estate // string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]); IUserManagement userManager = m_scene.RequestModuleInterface(); - string userName = "Unkown User"; if (userManager != null) - userName = userManager.GetUserName(uuidarr[i]); + userManager.GetUserName(uuidarr[i]); // we drop it. It gets cached though... so we're ready for the next request. // diva commnent 11/21/2010: uh?!? wft? + // justincc comment 21/01/2011: A side effect of userManager.GetUserName() I presume. } } #endregion diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs index 8df44feb8c..09c0ebb17f 100644 --- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs +++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs @@ -38,7 +38,7 @@ namespace OpenSim.Region.CoreModules.World.Sound { public class SoundModule : IRegionModule, ISoundModule { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); protected Scene m_scene; diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Perlin.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Perlin.cs index af59d7a1ba..522a7eb120 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Perlin.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Perlin.cs @@ -85,9 +85,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap public static float noise1(float arg) { int bx0, bx1; - float rx0, rx1, sx, t, u, v, a; - - a = arg; + float rx0, rx1, sx, t, u, v; t = arg + N; bx0 = ((int)t) & BM;