From 20940951b2360782214add0e3674f0fdc7060990 Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Fri, 27 Jun 2008 20:40:25 +0000
Subject: more warnings to go.
---
.../Agent/TextureDownload/TextureNotFoundSender.cs | 18 ++++++++++++------
.../Modules/Agent/TextureSender/TextureSender.cs | 14 ++++++++++----
.../Avatar/Currency/SampleMoney/SampleMoneyModule.cs | 20 ++++++++++----------
.../Modules/Grid/Interregion/InterregionModule.cs | 4 ++--
.../Scripting/HttpRequest/ScriptsHttpRequests.cs | 2 +-
5 files changed, 35 insertions(+), 23 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
index 7c187c0..c5af174 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
@@ -40,19 +40,19 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
//private static readonly log4net.ILog m_log
// = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
- private bool m_cancel = false;
- private IClientAPI m_client;
+ // private bool m_cancel = false;
+ // private IClientAPI m_client;
// See ITextureSender
- private bool m_sending = false;
+ // private bool m_sending = false;
private LLUUID m_textureId;
// See ITextureSender
public TextureNotFoundSender(IClientAPI client, LLUUID textureID)
{
- m_client = client;
+ // // m_client = client;
m_textureId = textureID;
}
@@ -61,13 +61,19 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
public bool Sending
{
get { return false; }
- set { m_sending = value; }
+ set
+ {
+ // m_sending = value;
+ }
}
public bool Cancel
{
get { return false; }
- set { m_cancel = value; }
+ set
+ {
+ // m_cancel = value;
+ }
}
// See ITextureSender
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
index be73156..7554d1a 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
@@ -57,11 +57,11 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
//public LLUUID assetID { get { return m_asset.FullID; } }
- private bool m_cancel = false;
+ // private bool m_cancel = false;
// See ITextureSender
- private bool m_sending = false;
+ // private bool m_sending = false;
/// <summary>
/// This is actually the number of extra packets required to send the texture data! We always assume
@@ -91,13 +91,19 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
public bool Cancel
{
get { return false; }
- set { m_cancel = value; }
+ set
+ {
+ // m_cancel = value;
+ }
}
public bool Sending
{
get { return false; }
- set { m_sending = value; }
+ set
+ {
+ // m_sending = value;
+ }
}
// See ITextureSender
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index 1883b0a..57524a9 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -60,18 +60,18 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
/// <summary>
/// Where Stipends come from and Fees go to.
/// </summary>
- private LLUUID EconomyBaseAccount = LLUUID.Zero;
+ // private LLUUID EconomyBaseAccount = LLUUID.Zero;
private float EnergyEfficiency = 0f;
private bool gridmode = false;
- private ObjectPaid handerOnObjectPaid;
+ // private ObjectPaid handerOnObjectPaid;
private bool m_enabled = true;
private IConfigSource m_gConfig;
private bool m_keepMoneyAcrossLogins = true;
private Dictionary<LLUUID, int> m_KnownClientFunds = new Dictionary<LLUUID, int>();
- private string m_LandAddress = String.Empty;
+ // private string m_LandAddress = String.Empty;
private int m_minFundsBeforeRefresh = 100;
private string m_MoneyAddress = String.Empty;
@@ -105,8 +105,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
private int TeleportMinPrice = 0;
private float TeleportPriceExponent = 0f;
- private int UserLevelPaysFees = 2;
- private Scene XMLRPCHandler;
+ // private int UserLevelPaysFees = 2;
+ // private Scene XMLRPCHandler;
#region IMoneyModule Members
@@ -136,7 +136,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
{
if (m_scenel.Count == 0)
{
- XMLRPCHandler = scene;
+ // XMLRPCHandler = scene;
// To use the following you need to add:
// -helperuri <ADDRESS TO HERE OR grid MONEY SERVER>
@@ -250,15 +250,15 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
PriceObjectScaleFactor = startupConfig.GetFloat("PriceObjectScaleFactor", 10);
PriceParcelRent = startupConfig.GetInt("PriceParcelRent", 1);
PriceGroupCreate = startupConfig.GetInt("PriceGroupCreate", -1);
- string EBA = startupConfig.GetString("EconomyBaseAccount", LLUUID.Zero.ToString());
- Helpers.TryParse(EBA, out EconomyBaseAccount);
+ // string EBA = startupConfig.GetString("EconomyBaseAccount", LLUUID.Zero.ToString());
+ // Helpers.TryParse(EBA, out EconomyBaseAccount);
- UserLevelPaysFees = startupConfig.GetInt("UserLevelPaysFees", -1);
+ // UserLevelPaysFees = startupConfig.GetInt("UserLevelPaysFees", -1);
m_stipend = startupConfig.GetInt("UserStipend", 500);
m_minFundsBeforeRefresh = startupConfig.GetInt("IssueStipendWhenClientIsBelowAmount", 10);
m_keepMoneyAcrossLogins = startupConfig.GetBoolean("KeepMoneyAcrossLogins", true);
m_MoneyAddress = startupConfig.GetString("CurrencyServer", String.Empty);
- m_LandAddress = startupConfig.GetString("LandServer", String.Empty);
+ // m_LandAddress = startupConfig.GetString("LandServer", String.Empty);
}
// Send ObjectCapacity to Scene.. Which sends it to the SimStatsReporter.
diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs b/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs
index 40d07de..acd0e5c 100644
--- a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs
+++ b/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs
@@ -61,7 +61,7 @@ namespace OpenSim.Region.Environment.Modules.Grid.Interregion
private readonly Dictionary<Location, string[]> m_neighbourInterfaces = new Dictionary<Location, string[]>();
private readonly Dictionary<Location, RemotingObject> m_neighbourRemote = new Dictionary<Location, RemotingObject>();
- private IConfigSource m_config;
+ // private IConfigSource m_config;
private const bool m_enabled = false;
private RemotingObject m_myRemote;
@@ -145,7 +145,7 @@ namespace OpenSim.Region.Environment.Modules.Grid.Interregion
{
m_myLocations.Add(new Location((int) scene.RegionInfo.RegionLocX,
(int) scene.RegionInfo.RegionLocY));
- m_config = source;
+ // m_config = source;
scene.RegisterModuleInterface<IInterregionModule>(this);
}
diff --git a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index 054b6fc..a267f53 100644
--- a/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
// <request id, HttpRequestClass>
private Dictionary<LLUUID, HttpRequestClass> m_pendingRequests;
private Scene m_scene;
- private Queue<HttpRequestClass> rpcQueue = new Queue<HttpRequestClass>();
+ // private Queue<HttpRequestClass> rpcQueue = new Queue<HttpRequestClass>();
public HttpRequestModule()
{
--
cgit v1.1