aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorDiva Canto2010-01-31 13:01:23 -0800
committerDiva Canto2010-01-31 13:01:23 -0800
commit041594ed075049f804fc157700a6d78e54194c0b (patch)
treeed89689bfdc1948b184438ee4c7329e0296660b4 /OpenSim/Region/OptionalModules
parent* Bug fix in XInventoryData -- groupOwned is an int in the DB (diff)
downloadopensim-SC_OLD-041594ed075049f804fc157700a6d78e54194c0b.zip
opensim-SC_OLD-041594ed075049f804fc157700a6d78e54194c0b.tar.gz
opensim-SC_OLD-041594ed075049f804fc157700a6d78e54194c0b.tar.bz2
opensim-SC_OLD-041594ed075049f804fc157700a6d78e54194c0b.tar.xz
Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as well as lots of other obsolete configs.
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs15
1 files changed, 1 insertions, 14 deletions
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index be2734d..b9a75cc 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -66,7 +66,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
66 // private UUID EconomyBaseAccount = UUID.Zero; 66 // private UUID EconomyBaseAccount = UUID.Zero;
67 67
68 private float EnergyEfficiency = 0f; 68 private float EnergyEfficiency = 0f;
69 private bool gridmode = false;
70 // private ObjectPaid handerOnObjectPaid; 69 // private ObjectPaid handerOnObjectPaid;
71 private bool m_enabled = true; 70 private bool m_enabled = true;
72 private bool m_sellEnabled = false; 71 private bool m_sellEnabled = false;
@@ -243,7 +242,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
243 { 242 {
244 if (config == "Startup" && startupConfig != null) 243 if (config == "Startup" && startupConfig != null)
245 { 244 {
246 gridmode = startupConfig.GetBoolean("gridmode", false);
247 m_enabled = (startupConfig.GetString("economymodule", "BetaGridLikeMoneyModule") == "BetaGridLikeMoneyModule"); 245 m_enabled = (startupConfig.GetString("economymodule", "BetaGridLikeMoneyModule") == "BetaGridLikeMoneyModule");
248 } 246 }
249 247
@@ -293,18 +291,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
293 291
294 private void GetClientFunds(IClientAPI client) 292 private void GetClientFunds(IClientAPI client)
295 { 293 {
296 // Here we check if we're in grid mode 294 CheckExistAndRefreshFunds(client.AgentId);
297 // I imagine that the 'check balance'
298 // function for the client should be here or shortly after
299
300 if (gridmode)
301 {
302 CheckExistAndRefreshFunds(client.AgentId);
303 }
304 else
305 {
306 CheckExistAndRefreshFunds(client.AgentId);
307 }
308 295
309 } 296 }
310 297