Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim

author: Melanie 2009-09-02 16:29:50 +0100
committer: Melanie 2009-09-02 16:29:50 +0100
commit: 8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95 (patch)
tree: aa5824b7839df1471077b276bf0cb89c13369805 /OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
parent: Correct the icons on wearables in agent inventory. To fully correct the issue (diff)
parent: switching LandManagementModule to "new" region module scheme; cleaning (diff)
download: opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.zip
opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.gz
opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.bz2
opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.xz
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 c882146..0de5215 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -8,6 +8,7 @@
    </Dependencies>
    <Extension path = "/OpenSim/RegionModules">
+        <RegionModule id="LandManagementModule" type="OpenSim.Region.CoreModules.World.Land.LandManagementModule" />
        <RegionModule id="ExportSerialisationModule" type="OpenSim.Region.CoreModules.World.Serialiser.SerialiserModule" />
        <RegionModule id="ArchiverModule" type="OpenSim.Region.CoreModules.World.Archiver.ArchiverModule" />
        <RegionModule id="CapabilitiesModule" type="OpenSim.Region.CoreModules.Agent.Capabilities.CapabilitiesModule" />
author	Melanie	2009-09-02 16:29:50 +0100
committer	Melanie	2009-09-02 16:29:50 +0100
commit	8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95 (patch)
tree	aa5824b7839df1471077b276bf0cb89c13369805 /OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
parent	Correct the icons on wearables in agent inventory. To fully correct the issue (diff)
parent	switching LandManagementModule to "new" region module scheme; cleaning (diff)
download	opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.zip opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.gz opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.bz2 opensim-SC_OLD-8e7b385883a2d9e590490c2d28cd2dbe2a7c5d95.tar.xz

diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml index c882146..0de5215 100644 --- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml +++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -8,6 +8,7 @@
8	</Dependencies>	8	</Dependencies>
9		9
10	<Extension path = "/OpenSim/RegionModules">	10	<Extension path = "/OpenSim/RegionModules">
		11	<RegionModule id="LandManagementModule" type="OpenSim.Region.CoreModules.World.Land.LandManagementModule" />
11	<RegionModule id="ExportSerialisationModule" type="OpenSim.Region.CoreModules.World.Serialiser.SerialiserModule" />	12	<RegionModule id="ExportSerialisationModule" type="OpenSim.Region.CoreModules.World.Serialiser.SerialiserModule" />
12	<RegionModule id="ArchiverModule" type="OpenSim.Region.CoreModules.World.Archiver.ArchiverModule" />	13	<RegionModule id="ArchiverModule" type="OpenSim.Region.CoreModules.World.Archiver.ArchiverModule" />
13	<RegionModule id="CapabilitiesModule" type="OpenSim.Region.CoreModules.Agent.Capabilities.CapabilitiesModule" />	14	<RegionModule id="CapabilitiesModule" type="OpenSim.Region.CoreModules.Agent.Capabilities.CapabilitiesModule" />