Merge branch 'master' into careminster

author: Melanie 2012-09-10 13:33:47 +0100
committer: Melanie 2012-09-10 13:33:47 +0100
commit: 3e1b6b8d20554e872ef6c56372841ee26cdf3d63 (patch)
tree: c9c643a6f58586ead0d9d8aff3cfd1686fc065ab /OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
parent: Merge branch 'master' into careminster (diff)
parent: passing in the function name to MOD_Api.ConvertFromLSL for more user-friendly... (diff)
download: opensim-SC-3e1b6b8d20554e872ef6c56372841ee26cdf3d63.zip
opensim-SC-3e1b6b8d20554e872ef6c56372841ee26cdf3d63.tar.gz
opensim-SC-3e1b6b8d20554e872ef6c56372841ee26cdf3d63.tar.bz2
opensim-SC-3e1b6b8d20554e872ef6c56372841ee26cdf3d63.tar.xz
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index a09945e..424e0ab 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -34,7 +34,6 @@
        <RegionModule id="LureModule" type="OpenSim.Region.CoreModules.Avatar.Lure.LureModule" />
        <RegionModule id="InventoryTransferModule" type="OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.InventoryTransferModule" />
        <RegionModule id="CoreAssetCache" type="OpenSim.Region.CoreModules.Asset.CoreAssetCache" />
-        <RegionModule id="FlotsamAssetCache" type="OpenSim.Region.CoreModules.Asset.FlotsamAssetCache" />
        <RegionModule id="GlynnTuckerAssetCache" type="OpenSim.Region.CoreModules.Asset.GlynnTuckerAssetCache" />
        <RegionModule id="CenomeMemoryAssetCache" type="OpenSim.Region.CoreModules.Asset.CenomeMemoryAssetCache"/>
        <RegionModule id="LibraryModule" type="OpenSim.Region.CoreModules.Framework.Library.LibraryModule"/>
author	Melanie	2012-09-10 13:33:47 +0100
committer	Melanie	2012-09-10 13:33:47 +0100
commit	3e1b6b8d20554e872ef6c56372841ee26cdf3d63 (patch)
tree	c9c643a6f58586ead0d9d8aff3cfd1686fc065ab /OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
parent	Merge branch 'master' into careminster (diff)
parent	passing in the function name to MOD_Api.ConvertFromLSL for more user-friendly... (diff)
download	opensim-SC-3e1b6b8d20554e872ef6c56372841ee26cdf3d63.zip opensim-SC-3e1b6b8d20554e872ef6c56372841ee26cdf3d63.tar.gz opensim-SC-3e1b6b8d20554e872ef6c56372841ee26cdf3d63.tar.bz2 opensim-SC-3e1b6b8d20554e872ef6c56372841ee26cdf3d63.tar.xz

diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml index a09945e..424e0ab 100644 --- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml +++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -34,7 +34,6 @@
34	<RegionModule id="LureModule" type="OpenSim.Region.CoreModules.Avatar.Lure.LureModule" />	34	<RegionModule id="LureModule" type="OpenSim.Region.CoreModules.Avatar.Lure.LureModule" />
35	<RegionModule id="InventoryTransferModule" type="OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.InventoryTransferModule" />	35	<RegionModule id="InventoryTransferModule" type="OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.InventoryTransferModule" />
36	<RegionModule id="CoreAssetCache" type="OpenSim.Region.CoreModules.Asset.CoreAssetCache" />	36	<RegionModule id="CoreAssetCache" type="OpenSim.Region.CoreModules.Asset.CoreAssetCache" />
37	<RegionModule id="FlotsamAssetCache" type="OpenSim.Region.CoreModules.Asset.FlotsamAssetCache" />
38	<RegionModule id="GlynnTuckerAssetCache" type="OpenSim.Region.CoreModules.Asset.GlynnTuckerAssetCache" />	37	<RegionModule id="GlynnTuckerAssetCache" type="OpenSim.Region.CoreModules.Asset.GlynnTuckerAssetCache" />
39	<RegionModule id="CenomeMemoryAssetCache" type="OpenSim.Region.CoreModules.Asset.CenomeMemoryAssetCache"/>	38	<RegionModule id="CenomeMemoryAssetCache" type="OpenSim.Region.CoreModules.Asset.CenomeMemoryAssetCache"/>
40	<RegionModule id="LibraryModule" type="OpenSim.Region.CoreModules.Framework.Library.LibraryModule"/>	39	<RegionModule id="LibraryModule" type="OpenSim.Region.CoreModules.Framework.Library.LibraryModule"/>