diff options
| author | Melanie | 2013-10-04 20:03:12 +0100 |
|---|---|---|
| committer | Melanie | 2013-10-04 20:03:12 +0100 |
| commit | 75c68fa29e3a2fed81c883e7925bf161e968639f (patch) | |
| tree | 13ba69e6818f634018a5954d38750cf48128b7f8 /OpenSim/Framework/RegionSettings.cs | |
| parent | Merge branch 'avination-current' into careminster (diff) | |
| parent | minor: Disable logging left active on regression test TestSameSimulatorIsolat... (diff) | |
| download | opensim-SC-75c68fa29e3a2fed81c883e7925bf161e968639f.zip opensim-SC-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.gz opensim-SC-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.bz2 opensim-SC-75c68fa29e3a2fed81c883e7925bf161e968639f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Framework/RegionSettings.cs')
| -rw-r--r-- | OpenSim/Framework/RegionSettings.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs index 47a2780..2c6529d 100644 --- a/OpenSim/Framework/RegionSettings.cs +++ b/OpenSim/Framework/RegionSettings.cs | |||
| @@ -200,7 +200,7 @@ namespace OpenSim.Framework | |||
| 200 | set { m_ObjectBonus = value; } | 200 | set { m_ObjectBonus = value; } |
| 201 | } | 201 | } |
| 202 | 202 | ||
| 203 | private int m_Maturity = 1; | 203 | private int m_Maturity = 0; |
| 204 | 204 | ||
| 205 | public int Maturity | 205 | public int Maturity |
| 206 | { | 206 | { |