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

author: Dan Lake 2012-03-27 12:51:58 -0700
committer: Dan Lake 2012-03-27 12:51:58 -0700
commit: 971d32fda3cf8384987a6709cd2242afecce13ab (patch)
tree: 2607c27fad429ff0036fe7b7d275ddf717397282 /OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
parent: When loading objects from DB, first add to scene, then call TriggerOnSceneObj... (diff)
parent: HG: beginning of a more restrictive inventory access procedure (optional). Ex... (diff)
download: opensim-SC-971d32fda3cf8384987a6709cd2242afecce13ab.zip
opensim-SC-971d32fda3cf8384987a6709cd2242afecce13ab.tar.gz
opensim-SC-971d32fda3cf8384987a6709cd2242afecce13ab.tar.bz2
opensim-SC-971d32fda3cf8384987a6709cd2242afecce13ab.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 e22fd38..dc6efed 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -9,6 +9,7 @@
    <Extension path = "/OpenSim/RegionModules">
        <RegionModule id="UserManagementModule" type="OpenSim.Region.CoreModules.Framework.UserManagement.UserManagementModule" />
+        <RegionModule id="HGUserManagementModule" type="OpenSim.Region.CoreModules.Framework.UserManagement.HGUserManagementModule" />
        <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	Dan Lake	2012-03-27 12:51:58 -0700
committer	Dan Lake	2012-03-27 12:51:58 -0700
commit	971d32fda3cf8384987a6709cd2242afecce13ab (patch)
tree	2607c27fad429ff0036fe7b7d275ddf717397282 /OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
parent	When loading objects from DB, first add to scene, then call TriggerOnSceneObj... (diff)
parent	HG: beginning of a more restrictive inventory access procedure (optional). Ex... (diff)
download	opensim-SC-971d32fda3cf8384987a6709cd2242afecce13ab.zip opensim-SC-971d32fda3cf8384987a6709cd2242afecce13ab.tar.gz opensim-SC-971d32fda3cf8384987a6709cd2242afecce13ab.tar.bz2 opensim-SC-971d32fda3cf8384987a6709cd2242afecce13ab.tar.xz

diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml index e22fd38..dc6efed 100644 --- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml +++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -9,6 +9,7 @@
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="UserManagementModule" type="OpenSim.Region.CoreModules.Framework.UserManagement.UserManagementModule" />
		12	<RegionModule id="HGUserManagementModule" type="OpenSim.Region.CoreModules.Framework.UserManagement.HGUserManagementModule" />
12	<RegionModule id="EntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule" />	13	<RegionModule id="EntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule" />
13	<RegionModule id="HGEntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.HGEntityTransferModule" />	14	<RegionModule id="HGEntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.HGEntityTransferModule" />
14	<RegionModule id="InventoryAccessModule" type="OpenSim.Region.CoreModules.Framework.InventoryAccess.BasicInventoryAccessModule" />	15	<RegionModule id="InventoryAccessModule" type="OpenSim.Region.CoreModules.Framework.InventoryAccess.BasicInventoryAccessModule" />