From 36426b0db219d005b4cba193c20c31fa8571966c Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sat, 21 Nov 2015 00:49:43 +0000
Subject: remove some compile warnings increasing total number by 2
---
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs | 6 +-----
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs | 8 +++-----
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | 4 ----
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | 2 --
OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs | 2 +-
OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs | 2 +-
6 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
index 59d8b9a..ac99692 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
@@ -55,11 +55,7 @@ namespace OpenSim.Capabilities.Handlers
private IAssetService m_assetService;
public const string DefaultFormat = "x-j2c";
-
- // TODO: Change this to a config option
- private string m_RedirectURL = null;
-
-
+
public GetTextureHandler(IAssetService assService)
{
m_assetService = assService;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
index f6a950f..be66ae5 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
@@ -350,7 +350,7 @@ namespace OpenSim.Region.ClientStack.Linden
else
return false;
}
- catch (Exception e)
+ catch
{
return false;
}
@@ -550,14 +550,12 @@ namespace OpenSim.Region.ClientStack.Linden
}
}
}
- catch (Exception e)
+ catch
{
return false;
}
OSDArray decodedMeshOsdArray = null;
- if ((!decodedMeshOsd is OSDArray))
- return false;
byte[] dummy;
@@ -618,7 +616,7 @@ namespace OpenSim.Region.ClientStack.Linden
}
}
}
- catch (Exception e)
+ catch
{
return false;
}
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index 79a3458..aa51a00 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -82,10 +82,6 @@ namespace OpenSim.Region.ClientStack.Linden
private static OpenMetaverse.BlockingQueue<aPollRequest> m_queue =
new OpenMetaverse.BlockingQueue<aPollRequest>();
-
- // TODO: Change this to a config option
- private string m_RedirectURL = null;
-
private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>();
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index adb838c..e0c4924 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -49,8 +49,6 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
using OSDArray = OpenMetaverse.StructuredData.OSDArray;
using OSDMap = OpenMetaverse.StructuredData.OSDMap;
-using Mono.Addins;
-
namespace OpenSim.Region.CoreModules.Avatar.Gods
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GodsModule")]
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs
index 4c9df9c..f535c41 100644
--- a/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/ODECharacter.cs
@@ -1290,7 +1290,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
m_eventsubscription = 0;
}
- internal void AddCollisionEvent(uint CollidedWith, ContactPoint contact)
+ public override void AddCollisionEvent(uint CollidedWith, ContactPoint contact)
{
if (m_eventsubscription > 0)
{
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
index ac082cb..8f2215a 100644
--- a/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
@@ -3124,7 +3124,7 @@ Console.WriteLine(" JointCreateFixed");
m_eventsubscription = 0;
}
- public void AddCollisionEvent(uint CollidedWith, ContactPoint contact)
+ public override void AddCollisionEvent(uint CollidedWith, ContactPoint contact)
{
CollisionEventsThisFrame.AddCollider(CollidedWith, contact);
}
--
cgit v1.1