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

author: Melanie 2010-11-22 00:46:37 +0000
committer: Melanie 2010-11-22 00:46:37 +0000
commit: 8466ada8e05c69d9fcd6f8191803d5c40659b641 (patch)
tree: 1ad6665b23863060d4ba1c1a91cae4f33f017a38 /OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
parent: Fox the buglets in Freeswitch. Grid mode works now and there is no reason why... (diff)
parent: Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download: opensim-SC_OLD-8466ada8e05c69d9fcd6f8191803d5c40659b641.zip
opensim-SC_OLD-8466ada8e05c69d9fcd6f8191803d5c40659b641.tar.gz
opensim-SC_OLD-8466ada8e05c69d9fcd6f8191803d5c40659b641.tar.bz2
opensim-SC_OLD-8466ada8e05c69d9fcd6f8191803d5c40659b641.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 df23eac..cfa4109 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="UserManagementModule" type="OpenSim.Region.CoreModules.Framework.UserManagement.UserManagementModule" />
        <RegionModule id="EntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule" />
        <RegionModule id="HGEntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.HGEntityTransferModule" />
        <RegionModule id="InventoryAccessModule" type="OpenSim.Region.CoreModules.Framework.InventoryAccess.BasicInventoryAccessModule" />
author	Melanie	2010-11-22 00:46:37 +0000
committer	Melanie	2010-11-22 00:46:37 +0000
commit	8466ada8e05c69d9fcd6f8191803d5c40659b641 (patch)
tree	1ad6665b23863060d4ba1c1a91cae4f33f017a38 /OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
parent	Fox the buglets in Freeswitch. Grid mode works now and there is no reason why... (diff)
parent	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download	opensim-SC_OLD-8466ada8e05c69d9fcd6f8191803d5c40659b641.zip opensim-SC_OLD-8466ada8e05c69d9fcd6f8191803d5c40659b641.tar.gz opensim-SC_OLD-8466ada8e05c69d9fcd6f8191803d5c40659b641.tar.bz2 opensim-SC_OLD-8466ada8e05c69d9fcd6f8191803d5c40659b641.tar.xz

diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml index df23eac..cfa4109 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="UserManagementModule" type="OpenSim.Region.CoreModules.Framework.UserManagement.UserManagementModule" />
11	<RegionModule id="EntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule" />	12	<RegionModule id="EntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule" />
12	<RegionModule id="HGEntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.HGEntityTransferModule" />	13	<RegionModule id="HGEntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.HGEntityTransferModule" />
13	<RegionModule id="InventoryAccessModule" type="OpenSim.Region.CoreModules.Framework.InventoryAccess.BasicInventoryAccessModule" />	14	<RegionModule id="InventoryAccessModule" type="OpenSim.Region.CoreModules.Framework.InventoryAccess.BasicInventoryAccessModule" />