diff options
author | Dr Scofield | 2008-06-27 20:40:25 +0000 |
---|---|---|
committer | Dr Scofield | 2008-06-27 20:40:25 +0000 |
commit | 20940951b2360782214add0e3674f0fdc7060990 (patch) | |
tree | fc320931fd0ba8f4f2d8efbc92271f2f858f5957 /OpenSim/Region | |
parent | * Experiment with not bothering with a seperate assets metadata file - extrac... (diff) | |
download | opensim-SC-20940951b2360782214add0e3674f0fdc7060990.zip opensim-SC-20940951b2360782214add0e3674f0fdc7060990.tar.gz opensim-SC-20940951b2360782214add0e3674f0fdc7060990.tar.bz2 opensim-SC-20940951b2360782214add0e3674f0fdc7060990.tar.xz |
more warnings to go.
Diffstat (limited to '')
5 files changed, 35 insertions, 23 deletions
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 | |||
40 | //private static readonly log4net.ILog m_log | 40 | //private static readonly log4net.ILog m_log |
41 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 41 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
42 | 42 | ||
43 | private bool m_cancel = false; | 43 | // private bool m_cancel = false; |
44 | private IClientAPI m_client; | 44 | // private IClientAPI m_client; |
45 | 45 | ||
46 | // See ITextureSender | 46 | // See ITextureSender |
47 | 47 | ||
48 | private bool m_sending = false; | 48 | // private bool m_sending = false; |
49 | private LLUUID m_textureId; | 49 | private LLUUID m_textureId; |
50 | 50 | ||
51 | // See ITextureSender | 51 | // See ITextureSender |
52 | 52 | ||
53 | public TextureNotFoundSender(IClientAPI client, LLUUID textureID) | 53 | public TextureNotFoundSender(IClientAPI client, LLUUID textureID) |
54 | { | 54 | { |
55 | m_client = client; | 55 | // // m_client = client; |
56 | m_textureId = textureID; | 56 | m_textureId = textureID; |
57 | } | 57 | } |
58 | 58 | ||
@@ -61,13 +61,19 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload | |||
61 | public bool Sending | 61 | public bool Sending |
62 | { | 62 | { |
63 | get { return false; } | 63 | get { return false; } |
64 | set { m_sending = value; } | 64 | set |
65 | { | ||
66 | // m_sending = value; | ||
67 | } | ||
65 | } | 68 | } |
66 | 69 | ||
67 | public bool Cancel | 70 | public bool Cancel |
68 | { | 71 | { |
69 | get { return false; } | 72 | get { return false; } |
70 | set { m_cancel = value; } | 73 | set |
74 | { | ||
75 | // m_cancel = value; | ||
76 | } | ||
71 | } | 77 | } |
72 | 78 | ||
73 | // See ITextureSender | 79 | // 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 | |||
57 | 57 | ||
58 | //public LLUUID assetID { get { return m_asset.FullID; } } | 58 | //public LLUUID assetID { get { return m_asset.FullID; } } |
59 | 59 | ||
60 | private bool m_cancel = false; | 60 | // private bool m_cancel = false; |
61 | 61 | ||
62 | // See ITextureSender | 62 | // See ITextureSender |
63 | 63 | ||
64 | private bool m_sending = false; | 64 | // private bool m_sending = false; |
65 | 65 | ||
66 | /// <summary> | 66 | /// <summary> |
67 | /// This is actually the number of extra packets required to send the texture data! We always assume | 67 | /// 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 | |||
91 | public bool Cancel | 91 | public bool Cancel |
92 | { | 92 | { |
93 | get { return false; } | 93 | get { return false; } |
94 | set { m_cancel = value; } | 94 | set |
95 | { | ||
96 | // m_cancel = value; | ||
97 | } | ||
95 | } | 98 | } |
96 | 99 | ||
97 | public bool Sending | 100 | public bool Sending |
98 | { | 101 | { |
99 | get { return false; } | 102 | get { return false; } |
100 | set { m_sending = value; } | 103 | set |
104 | { | ||
105 | // m_sending = value; | ||
106 | } | ||
101 | } | 107 | } |
102 | 108 | ||
103 | // See ITextureSender | 109 | // 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 | |||
60 | /// <summary> | 60 | /// <summary> |
61 | /// Where Stipends come from and Fees go to. | 61 | /// Where Stipends come from and Fees go to. |
62 | /// </summary> | 62 | /// </summary> |
63 | private LLUUID EconomyBaseAccount = LLUUID.Zero; | 63 | // private LLUUID EconomyBaseAccount = LLUUID.Zero; |
64 | 64 | ||
65 | private float EnergyEfficiency = 0f; | 65 | private float EnergyEfficiency = 0f; |
66 | private bool gridmode = false; | 66 | private bool gridmode = false; |
67 | private ObjectPaid handerOnObjectPaid; | 67 | // private ObjectPaid handerOnObjectPaid; |
68 | private bool m_enabled = true; | 68 | private bool m_enabled = true; |
69 | 69 | ||
70 | private IConfigSource m_gConfig; | 70 | private IConfigSource m_gConfig; |
71 | 71 | ||
72 | private bool m_keepMoneyAcrossLogins = true; | 72 | private bool m_keepMoneyAcrossLogins = true; |
73 | private Dictionary<LLUUID, int> m_KnownClientFunds = new Dictionary<LLUUID, int>(); | 73 | private Dictionary<LLUUID, int> m_KnownClientFunds = new Dictionary<LLUUID, int>(); |
74 | private string m_LandAddress = String.Empty; | 74 | // private string m_LandAddress = String.Empty; |
75 | 75 | ||
76 | private int m_minFundsBeforeRefresh = 100; | 76 | private int m_minFundsBeforeRefresh = 100; |
77 | private string m_MoneyAddress = String.Empty; | 77 | private string m_MoneyAddress = String.Empty; |
@@ -105,8 +105,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney | |||
105 | private int TeleportMinPrice = 0; | 105 | private int TeleportMinPrice = 0; |
106 | 106 | ||
107 | private float TeleportPriceExponent = 0f; | 107 | private float TeleportPriceExponent = 0f; |
108 | private int UserLevelPaysFees = 2; | 108 | // private int UserLevelPaysFees = 2; |
109 | private Scene XMLRPCHandler; | 109 | // private Scene XMLRPCHandler; |
110 | 110 | ||
111 | #region IMoneyModule Members | 111 | #region IMoneyModule Members |
112 | 112 | ||
@@ -136,7 +136,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney | |||
136 | { | 136 | { |
137 | if (m_scenel.Count == 0) | 137 | if (m_scenel.Count == 0) |
138 | { | 138 | { |
139 | XMLRPCHandler = scene; | 139 | // XMLRPCHandler = scene; |
140 | 140 | ||
141 | // To use the following you need to add: | 141 | // To use the following you need to add: |
142 | // -helperuri <ADDRESS TO HERE OR grid MONEY SERVER> | 142 | // -helperuri <ADDRESS TO HERE OR grid MONEY SERVER> |
@@ -250,15 +250,15 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney | |||
250 | PriceObjectScaleFactor = startupConfig.GetFloat("PriceObjectScaleFactor", 10); | 250 | PriceObjectScaleFactor = startupConfig.GetFloat("PriceObjectScaleFactor", 10); |
251 | PriceParcelRent = startupConfig.GetInt("PriceParcelRent", 1); | 251 | PriceParcelRent = startupConfig.GetInt("PriceParcelRent", 1); |
252 | PriceGroupCreate = startupConfig.GetInt("PriceGroupCreate", -1); | 252 | PriceGroupCreate = startupConfig.GetInt("PriceGroupCreate", -1); |
253 | string EBA = startupConfig.GetString("EconomyBaseAccount", LLUUID.Zero.ToString()); | 253 | // string EBA = startupConfig.GetString("EconomyBaseAccount", LLUUID.Zero.ToString()); |
254 | Helpers.TryParse(EBA, out EconomyBaseAccount); | 254 | // Helpers.TryParse(EBA, out EconomyBaseAccount); |
255 | 255 | ||
256 | UserLevelPaysFees = startupConfig.GetInt("UserLevelPaysFees", -1); | 256 | // UserLevelPaysFees = startupConfig.GetInt("UserLevelPaysFees", -1); |
257 | m_stipend = startupConfig.GetInt("UserStipend", 500); | 257 | m_stipend = startupConfig.GetInt("UserStipend", 500); |
258 | m_minFundsBeforeRefresh = startupConfig.GetInt("IssueStipendWhenClientIsBelowAmount", 10); | 258 | m_minFundsBeforeRefresh = startupConfig.GetInt("IssueStipendWhenClientIsBelowAmount", 10); |
259 | m_keepMoneyAcrossLogins = startupConfig.GetBoolean("KeepMoneyAcrossLogins", true); | 259 | m_keepMoneyAcrossLogins = startupConfig.GetBoolean("KeepMoneyAcrossLogins", true); |
260 | m_MoneyAddress = startupConfig.GetString("CurrencyServer", String.Empty); | 260 | m_MoneyAddress = startupConfig.GetString("CurrencyServer", String.Empty); |
261 | m_LandAddress = startupConfig.GetString("LandServer", String.Empty); | 261 | // m_LandAddress = startupConfig.GetString("LandServer", String.Empty); |
262 | } | 262 | } |
263 | 263 | ||
264 | // Send ObjectCapacity to Scene.. Which sends it to the SimStatsReporter. | 264 | // 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 | |||
61 | 61 | ||
62 | private readonly Dictionary<Location, string[]> m_neighbourInterfaces = new Dictionary<Location, string[]>(); | 62 | private readonly Dictionary<Location, string[]> m_neighbourInterfaces = new Dictionary<Location, string[]>(); |
63 | private readonly Dictionary<Location, RemotingObject> m_neighbourRemote = new Dictionary<Location, RemotingObject>(); | 63 | private readonly Dictionary<Location, RemotingObject> m_neighbourRemote = new Dictionary<Location, RemotingObject>(); |
64 | private IConfigSource m_config; | 64 | // private IConfigSource m_config; |
65 | private const bool m_enabled = false; | 65 | private const bool m_enabled = false; |
66 | 66 | ||
67 | private RemotingObject m_myRemote; | 67 | private RemotingObject m_myRemote; |
@@ -145,7 +145,7 @@ namespace OpenSim.Region.Environment.Modules.Grid.Interregion | |||
145 | { | 145 | { |
146 | m_myLocations.Add(new Location((int) scene.RegionInfo.RegionLocX, | 146 | m_myLocations.Add(new Location((int) scene.RegionInfo.RegionLocX, |
147 | (int) scene.RegionInfo.RegionLocY)); | 147 | (int) scene.RegionInfo.RegionLocY)); |
148 | m_config = source; | 148 | // m_config = source; |
149 | 149 | ||
150 | scene.RegisterModuleInterface<IInterregionModule>(this); | 150 | scene.RegisterModuleInterface<IInterregionModule>(this); |
151 | } | 151 | } |
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 | |||
92 | // <request id, HttpRequestClass> | 92 | // <request id, HttpRequestClass> |
93 | private Dictionary<LLUUID, HttpRequestClass> m_pendingRequests; | 93 | private Dictionary<LLUUID, HttpRequestClass> m_pendingRequests; |
94 | private Scene m_scene; | 94 | private Scene m_scene; |
95 | private Queue<HttpRequestClass> rpcQueue = new Queue<HttpRequestClass>(); | 95 | // private Queue<HttpRequestClass> rpcQueue = new Queue<HttpRequestClass>(); |
96 | 96 | ||
97 | public HttpRequestModule() | 97 | public HttpRequestModule() |
98 | { | 98 | { |