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
---
.../ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs | 4 ++--
OpenSim/Data/Tests/BasicAssetTest.cs | 2 +-
OpenSim/Data/Tests/BasicInventoryTest.cs | 2 +-
OpenSim/Data/Tests/BasicRegionTest.cs | 2 +-
OpenSim/Data/Tests/BasicUserTest.cs | 2 +-
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 6 +++---
.../Agent/AssetTransaction/AgentAssetTransactionsManager.cs | 8 ++++----
.../Modules/Agent/AssetTransaction/AssetXferUploader.cs | 4 ----
OpenSim/Region/Environment/Modules/World/Wind/WindModule.cs | 8 ++++----
OpenSim/Region/ScriptEngine/Common/ScriptBaseClass.cs | 2 +-
10 files changed, 18 insertions(+), 22 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
index 4a44321..a6d5b01 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
@@ -343,7 +343,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
Rest.Log.DebugFormat("{0} POST ENTRY", MsgId);
- AvatarAppearance old = Rest.AvatarServices.GetUserAppearance(rdata.userProfile.ID);
+ //AvatarAppearance old = Rest.AvatarServices.GetUserAppearance(rdata.userProfile.ID);
rdata.userAppearance = new AvatarAppearance();
@@ -749,7 +749,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
rdata.writer.WriteStartElement("Appearance");
rdata.writer.WriteAttributeString("Height", rdata.userAppearance.AvatarHeight.ToString());
- if (rdata.userAppearance.Owner != null)
+ if (!rdata.userAppearance.Owner.Equals(null))
rdata.writer.WriteAttributeString("Owner", rdata.userAppearance.Owner.ToString());
rdata.writer.WriteAttributeString("Serial", rdata.userAppearance.Serial.ToString());
diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs
index 53c9379..6546472 100644
--- a/OpenSim/Data/Tests/BasicAssetTest.cs
+++ b/OpenSim/Data/Tests/BasicAssetTest.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Data.Tests
{
log4net.Config.XmlConfigurator.Configure();
}
- catch (Exception e)
+ catch (Exception)
{
// I don't care, just leave log4net off
}
diff --git a/OpenSim/Data/Tests/BasicInventoryTest.cs b/OpenSim/Data/Tests/BasicInventoryTest.cs
index ebba081..ea8e4e8 100644
--- a/OpenSim/Data/Tests/BasicInventoryTest.cs
+++ b/OpenSim/Data/Tests/BasicInventoryTest.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Data.Tests
{
log4net.Config.XmlConfigurator.Configure();
}
- catch (Exception e)
+ catch (Exception)
{
// I don't care, just leave log4net off
}
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index 6f0160f..f9c5565 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Data.Tests
{
log4net.Config.XmlConfigurator.Configure();
}
- catch (Exception e)
+ catch (Exception)
{
// I don't care, just leave log4net off
}
diff --git a/OpenSim/Data/Tests/BasicUserTest.cs b/OpenSim/Data/Tests/BasicUserTest.cs
index 36c8e21..9587d86 100644
--- a/OpenSim/Data/Tests/BasicUserTest.cs
+++ b/OpenSim/Data/Tests/BasicUserTest.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Data.Tests
{
log4net.Config.XmlConfigurator.Configure();
}
- catch (Exception e)
+ catch (Exception)
{
// I don't care, just leave log4net off
}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 39bda70..4027377 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1242,8 +1242,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// Send terrain layer information to the client.
///
///
- private void DoSendWindData(object o)
- {
+ //private void DoSendWindData(object o)
+ //{
//float[] map = (float[])o;
//try
@@ -1268,7 +1268,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
//{
// m_log.Warn("[CLIENT]: ClientView.API.cs: SendLayerData() - Failed with exception " + e.ToString());
// }
- }
+ //}
///
/// Sends a set of four patches (x, x+1, ..., x+3) to the client
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)
{
diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptBaseClass.cs b/OpenSim/Region/ScriptEngine/Common/ScriptBaseClass.cs
index 1bcccf1..b5a7196 100644
--- a/OpenSim/Region/ScriptEngine/Common/ScriptBaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/ScriptBaseClass.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.ScriptEngine.Common
private Executor m_Exec;
- private string m_state = "default";
+ //private string m_state = "default";
public void state(string newState)
{
--
cgit v1.1