OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more warnings to go.

0.6.0-stable
Dr Scofield 2008-06-27 20:40:25 +00:00
parent 810d3da2b9
commit 20940951b2
5 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs
View File

@ -40,19 +40,19 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
//private static readonly log4net.ILog m_log //private static readonly log4net.ILog m_log
// = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
private bool m_cancel = false; // private bool m_cancel = false;
private IClientAPI m_client; // private IClientAPI m_client;
// See ITextureSender // See ITextureSender
private bool m_sending = false; // private bool m_sending = false;
private LLUUID m_textureId; private LLUUID m_textureId;
// See ITextureSender // See ITextureSender
public TextureNotFoundSender(IClientAPI client, LLUUID textureID) public TextureNotFoundSender(IClientAPI client, LLUUID textureID)
{ {
m_client = client; // // m_client = client;
m_textureId = textureID; m_textureId = textureID;
} }
@ -61,13 +61,19 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload
public bool Sending public bool Sending
{ {
get { return false; } get { return false; }
set { m_sending = value; } set
{
// m_sending = value;
}
} }
public bool Cancel public bool Cancel
{ {
get { return false; } get { return false; }
set { m_cancel = value; } set
{
// m_cancel = value;
}
} }
// See ITextureSender // See ITextureSender

14
OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
View File

@ -57,11 +57,11 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
//public LLUUID assetID { get { return m_asset.FullID; } } //public LLUUID assetID { get { return m_asset.FullID; } }
private bool m_cancel = false; // private bool m_cancel = false;
// See ITextureSender // See ITextureSender
private bool m_sending = false; // private bool m_sending = false;
/// <summary> /// <summary>
/// This is actually the number of extra packets required to send the texture data! We always assume /// 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 public bool Cancel
{ {
get { return false; } get { return false; }
set { m_cancel = value; } set
{
// m_cancel = value;
}
} }
public bool Sending public bool Sending
{ {
get { return false; } get { return false; }
set { m_sending = value; } set
{
// m_sending = value;
}
} }
// See ITextureSender // See ITextureSender

20
OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
View File

@ -60,18 +60,18 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
/// <summary> /// <summary>
/// Where Stipends come from and Fees go to. /// Where Stipends come from and Fees go to.
/// </summary> /// </summary>
private LLUUID EconomyBaseAccount = LLUUID.Zero; // private LLUUID EconomyBaseAccount = LLUUID.Zero;
private float EnergyEfficiency = 0f; private float EnergyEfficiency = 0f;
private bool gridmode = false; private bool gridmode = false;
private ObjectPaid handerOnObjectPaid; // private ObjectPaid handerOnObjectPaid;
private bool m_enabled = true; private bool m_enabled = true;
private IConfigSource m_gConfig; private IConfigSource m_gConfig;
private bool m_keepMoneyAcrossLogins = true; private bool m_keepMoneyAcrossLogins = true;
private Dictionary<LLUUID, int> m_KnownClientFunds = new Dictionary<LLUUID, int>(); 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 int m_minFundsBeforeRefresh = 100;
private string m_MoneyAddress = String.Empty; private string m_MoneyAddress = String.Empty;
@ -105,8 +105,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
private int TeleportMinPrice = 0; private int TeleportMinPrice = 0;
private float TeleportPriceExponent = 0f; private float TeleportPriceExponent = 0f;
private int UserLevelPaysFees = 2; // private int UserLevelPaysFees = 2;
private Scene XMLRPCHandler; // private Scene XMLRPCHandler;
#region IMoneyModule Members #region IMoneyModule Members
@ -136,7 +136,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney
{ {
if (m_scenel.Count == 0) if (m_scenel.Count == 0)
{ {
XMLRPCHandler = scene; // XMLRPCHandler = scene;
// To use the following you need to add: // To use the following you need to add:
// -helperuri <ADDRESS TO HERE OR grid MONEY SERVER> // -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); PriceObjectScaleFactor = startupConfig.GetFloat("PriceObjectScaleFactor", 10);
PriceParcelRent = startupConfig.GetInt("PriceParcelRent", 1); PriceParcelRent = startupConfig.GetInt("PriceParcelRent", 1);
PriceGroupCreate = startupConfig.GetInt("PriceGroupCreate", -1); PriceGroupCreate = startupConfig.GetInt("PriceGroupCreate", -1);
string EBA = startupConfig.GetString("EconomyBaseAccount", LLUUID.Zero.ToString()); // string EBA = startupConfig.GetString("EconomyBaseAccount", LLUUID.Zero.ToString());
Helpers.TryParse(EBA, out EconomyBaseAccount); // Helpers.TryParse(EBA, out EconomyBaseAccount);
UserLevelPaysFees = startupConfig.GetInt("UserLevelPaysFees", -1); // UserLevelPaysFees = startupConfig.GetInt("UserLevelPaysFees", -1);
m_stipend = startupConfig.GetInt("UserStipend", 500); m_stipend = startupConfig.GetInt("UserStipend", 500);
m_minFundsBeforeRefresh = startupConfig.GetInt("IssueStipendWhenClientIsBelowAmount", 10); m_minFundsBeforeRefresh = startupConfig.GetInt("IssueStipendWhenClientIsBelowAmount", 10);
m_keepMoneyAcrossLogins = startupConfig.GetBoolean("KeepMoneyAcrossLogins", true); m_keepMoneyAcrossLogins = startupConfig.GetBoolean("KeepMoneyAcrossLogins", true);
m_MoneyAddress = startupConfig.GetString("CurrencyServer", String.Empty); 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. // Send ObjectCapacity to Scene.. Which sends it to the SimStatsReporter.

4
OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs
View File

@ -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, string[]> m_neighbourInterfaces = new Dictionary<Location, string[]>();
private readonly Dictionary<Location, RemotingObject> m_neighbourRemote = new Dictionary<Location, RemotingObject>(); 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 const bool m_enabled = false;
private RemotingObject m_myRemote; private RemotingObject m_myRemote;
@ -145,7 +145,7 @@ namespace OpenSim.Region.Environment.Modules.Grid.Interregion
{ {
m_myLocations.Add(new Location((int) scene.RegionInfo.RegionLocX, m_myLocations.Add(new Location((int) scene.RegionInfo.RegionLocX,
(int) scene.RegionInfo.RegionLocY)); (int) scene.RegionInfo.RegionLocY));
m_config = source; // m_config = source;
scene.RegisterModuleInterface<IInterregionModule>(this); scene.RegisterModuleInterface<IInterregionModule>(this);
} }

2
OpenSim/Region/Environment/Modules/Scripting/HttpRequest/ScriptsHttpRequests.cs
View File

@ -92,7 +92,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.HttpRequest
// <request id, HttpRequestClass> // <request id, HttpRequestClass>
private Dictionary<LLUUID, HttpRequestClass> m_pendingRequests; private Dictionary<LLUUID, HttpRequestClass> m_pendingRequests;
private Scene m_scene; private Scene m_scene;
private Queue<HttpRequestClass> rpcQueue = new Queue<HttpRequestClass>(); // private Queue<HttpRequestClass> rpcQueue = new Queue<HttpRequestClass>();
public HttpRequestModule() public HttpRequestModule()
{ {