Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-10-21 20:26:29 +01:00
5 changed files with 5 additions and 14 deletions

View File

@@ -83,7 +83,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
// private int m_stipend = 1000;
// private int ObjectCapacity = 45000;
private int ObjectCount = 0;
private int PriceEnergyUnit = 0;
private int PriceGroupCreate = 0;
@@ -135,7 +134,6 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
public void AddRegion(Scene scene)
{
// Send ObjectCapacity to Scene.. Which sends it to the SimStatsReporter.
if (m_enabled)
{
scene.RegisterModuleInterface<IMoneyModule>(this);