diff options
| author | Melanie | 2012-10-23 17:23:36 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-23 17:23:36 +0100 |
| commit | 13cef0b16adabee46689dab69beec9a8ec813221 (patch) | |
| tree | 62ca6d661b1b2345e5b92889b136e77f776508db /OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Refactor: Move Dwell reply to a module that can be disabled. The prior, (diff) | |
| download | opensim-SC-13cef0b16adabee46689dab69beec9a8ec813221.zip opensim-SC-13cef0b16adabee46689dab69beec9a8ec813221.tar.gz opensim-SC-13cef0b16adabee46689dab69beec9a8ec813221.tar.bz2 opensim-SC-13cef0b16adabee46689dab69beec9a8ec813221.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/LandData.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml')
| -rw-r--r-- | OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml index 424e0ab..6c73d91 100644 --- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml +++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | <RegionModule id="InventoryAccessModule" type="OpenSim.Region.CoreModules.Framework.InventoryAccess.BasicInventoryAccessModule" /> | 15 | <RegionModule id="InventoryAccessModule" type="OpenSim.Region.CoreModules.Framework.InventoryAccess.BasicInventoryAccessModule" /> |
| 16 | <RegionModule id="HGInventoryAccessModule" type="OpenSim.Region.CoreModules.Framework.InventoryAccess.HGInventoryAccessModule" /> | 16 | <RegionModule id="HGInventoryAccessModule" type="OpenSim.Region.CoreModules.Framework.InventoryAccess.HGInventoryAccessModule" /> |
| 17 | <RegionModule id="LandManagementModule" type="OpenSim.Region.CoreModules.World.Land.LandManagementModule" /> | 17 | <RegionModule id="LandManagementModule" type="OpenSim.Region.CoreModules.World.Land.LandManagementModule" /> |
| 18 | <RegionModule id="DwellModule" type="OpenSim.Region.CoreModules.World.Land.DwellModule" /> | ||
| 18 | <RegionModule id="PrimCountModule" type="OpenSim.Region.CoreModules.World.Land.PrimCountModule" /> | 19 | <RegionModule id="PrimCountModule" type="OpenSim.Region.CoreModules.World.Land.PrimCountModule" /> |
| 19 | <RegionModule id="ExportSerialisationModule" type="OpenSim.Region.CoreModules.World.Serialiser.SerialiserModule" /> | 20 | <RegionModule id="ExportSerialisationModule" type="OpenSim.Region.CoreModules.World.Serialiser.SerialiserModule" /> |
| 20 | <RegionModule id="ArchiverModule" type="OpenSim.Region.CoreModules.World.Archiver.ArchiverModule" /> | 21 | <RegionModule id="ArchiverModule" type="OpenSim.Region.CoreModules.World.Archiver.ArchiverModule" /> |