Merge branch 'opensim-master' into dev-appearance

This commit is contained in:
Master ScienceSim
2010-10-28 09:09:42 -07:00
28 changed files with 273 additions and 130 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);