From ad7b005784cd44fe6db20db365f7723e23bdc51a Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Tue, 7 Apr 2009 20:24:09 +0000 Subject: [PATCH] * minor: remove some mono compiler warnings --- OpenSim/Grid/InventoryServer/Main.cs | 4 ++-- .../REST/RESTInterregionComms.cs | 2 +- .../CoreModules/World/Cloud/CloudModule.cs | 4 ++-- .../CoreModules/World/Wind/WindModule.cs | 2 +- OpenSim/Region/Framework/Scenes/Scene.cs | 3 ++- .../Shared/Api/Runtime/OSSL_Stub.cs | 23 +++++++++---------- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs index 70efb850bf..fa316b1764 100644 --- a/OpenSim/Grid/InventoryServer/Main.cs +++ b/OpenSim/Grid/InventoryServer/Main.cs @@ -44,7 +44,7 @@ namespace OpenSim.Grid.InventoryServer private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private GridInventoryService m_inventoryService; - private HGInventoryService m_directInventoryService; + //private HGInventoryService m_directInventoryService; public const string LogName = "INVENTORY"; @@ -83,7 +83,7 @@ namespace OpenSim.Grid.InventoryServer m_log.Info("[" + LogName + "]: Started HTTP server"); - m_directInventoryService = new HGInventoryService(m_inventoryService, config.AssetServerURL, config.UserServerURL, m_httpServer, config.InventoryServerURL); + //m_directInventoryService = new HGInventoryService(m_inventoryService, config.AssetServerURL, config.UserServerURL, m_httpServer, config.InventoryServerURL); base.StartupSpecific(); diff --git a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs index 90104f24b9..8b2a5ca16e 100644 --- a/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs +++ b/OpenSim/Region/CoreModules/Communications/REST/RESTInterregionComms.cs @@ -654,7 +654,7 @@ namespace OpenSim.Region.CoreModules.Communications.REST if (args["itemid"] != null) itemID = args["itemid"].AsUUID(); - UUID regionID = m_localBackend.GetRegionID(regionhandle); + //UUID regionID = m_localBackend.GetRegionID(regionhandle); // This is the meaning of PUT object bool result = m_localBackend.SendCreateObject(regionhandle, userID, itemID); diff --git a/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs b/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs index e164f088ee..98f31f6cd5 100644 --- a/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs +++ b/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs @@ -37,8 +37,8 @@ namespace OpenSim.Region.CoreModules { public class CloudModule : ICloudModule { - private static readonly log4net.ILog m_log - = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly log4net.ILog m_log +// = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private Random m_rndnums = new Random(Environment.TickCount); private Scene m_scene = null; diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs index 700fe2f019..a8c9ac53cf 100644 --- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs +++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs @@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules private uint m_frame = 0; private uint m_frameLastUpdateClientArray = 0; private int m_frameUpdateRate = 150; - private Random m_rndnums = new Random(Environment.TickCount); + //private Random m_rndnums = new Random(Environment.TickCount); private Scene m_scene = null; private bool m_ready = false; diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 0991171434..32667037de 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -1744,8 +1744,9 @@ namespace OpenSim.Region.Framework.Scenes if (sp != null) { uint attPt = (uint)sp.Appearance.GetAttachpoint(itemID); - SceneObjectGroup sog = m_sceneGraph.RezSingleAttachment(sp.ControllingClient, itemID, attPt); + m_sceneGraph.RezSingleAttachment(sp.ControllingClient, itemID, attPt); } + return false; } diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index 54ae32a948..3ca40954dd 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs @@ -91,18 +91,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase { return m_OSSL_Functions.osWindActiveModelPluginName(); } - - void osWindParamSet(string plugin, string param, float value) - { - m_OSSL_Functions.osWindParamSet(plugin, param, value); - } - - float osWindParamGet(string plugin, string param) - { - return m_OSSL_Functions.osWindParamGet(plugin, param); - } - - + +// Not yet plugged in as available OSSL functions, so commented out +// void osWindParamSet(string plugin, string param, float value) +// { +// m_OSSL_Functions.osWindParamSet(plugin, param, value); +// } +// +// float osWindParamGet(string plugin, string param) +// { +// return m_OSSL_Functions.osWindParamGet(plugin, param); +// } public double osList2Double(LSL_Types.list src, int index) {