From e4c7bdc730ab2d550b8c308841049224c0cbddf6 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Tue, 30 Dec 2008 20:48:31 +0000 Subject: * Remove mono compiler warnings * Leaving the 23 warnings in ChildAgentDataUpdate.cs for Diva to look at --- OpenSim/Region/Environment/Interfaces/IEstateModule.cs | 2 +- .../Modules/Communications/REST/RESTInterregionComms.cs | 8 +++++--- OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 9 +-------- OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs | 1 - 4 files changed, 7 insertions(+), 13 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/Environment/Interfaces/IEstateModule.cs b/OpenSim/Region/Environment/Interfaces/IEstateModule.cs index 8e393bb..d84af20 100644 --- a/OpenSim/Region/Environment/Interfaces/IEstateModule.cs +++ b/OpenSim/Region/Environment/Interfaces/IEstateModule.cs @@ -37,7 +37,7 @@ namespace OpenSim.Region.Environment.Interfaces bool IsManager(UUID avatarID); /// - /// Tell all clients about the current state of the region (terrain textures, water height, etc.) + /// Tell all clients about the current state of the region (terrain textures, water height, etc.). /// void sendRegionHandshakeToAll(); } diff --git a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs index 77aad6b..92c9463 100644 --- a/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs +++ b/OpenSim/Region/Environment/Modules/Communications/REST/RESTInterregionComms.cs @@ -191,7 +191,8 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST os.Close(); //m_log.InfoFormat("[REST COMMS]: Posted ChildAgentUpdate request to remote sim {0}", uri); } - catch (WebException ex) + //catch (WebException ex) + catch { //m_log.InfoFormat("[REST COMMS]: Bad send on ChildAgentUpdate {0}", ex.Message); @@ -200,7 +201,7 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST // Let's wait for the response //m_log.Info("[REST COMMS]: Waiting for a reply after ChildAgentUpdate"); - string reply = null; + try { WebResponse webResponse = ChildUpdateRequest.GetResponse(); @@ -210,7 +211,8 @@ namespace OpenSim.Region.Environment.Modules.Communications.REST } StreamReader sr = new StreamReader(webResponse.GetResponseStream()); - reply = sr.ReadToEnd().Trim(); + //reply = sr.ReadToEnd().Trim(); + sr.ReadToEnd().Trim(); sr.Close(); //m_log.InfoFormat("[REST COMMS]: ChilAgentUpdate reply was {0} ", reply); diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 1f671ab..1e26c91 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs @@ -1800,8 +1800,6 @@ namespace OpenSim.Region.Environment.Scenes string sceneObjectXml = objectGroup.ToXmlString(); - bool useOwner = false; - // Get the user info of the item destination // CachedUserInfo userInfo; @@ -1849,13 +1847,8 @@ namespace OpenSim.Region.Environment.Scenes // InventoryFolderBase folder = null; - InventoryItemBase item = null; - + InventoryItemBase item = null; - // No folder type needed - // We don't go here unless we have a user logged in - // so the skeleton is loaded - // if (DeRezAction.SaveToExistingUserInventoryItem == action) { item = userInfo.RootFolder.FindItem( diff --git a/OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs b/OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs index 9858d6a..8180497 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePhysicsJoint.cs @@ -30,7 +30,6 @@ using OpenMetaverse; using Ode.NET; using OpenSim.Framework; using OpenSim.Region.Physics.Manager; -using OpenSim.Region.Physics.Manager; using OpenSim.Region.Physics.OdePlugin; namespace OpenSim.Region.Physics.OdePlugin -- cgit v1.1