Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
author: Melanie 2012-11-11 16:31:01 +0000
committer: Melanie 2012-11-11 16:31:01 +0000
commit: 389077345f9fc78fddcaa39e29daa532a32815d6 (patch)
tree: a455d88d93ac5fe984ebf5342276ca1ddc831442 /OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
parent: Merge branch 'master' into careminster (diff)
parent: Deleted 2 obsolete modules: OGSRadmin and OpenGridProtocol. They were still I... (diff)
download: opensim-SC_OLD-389077345f9fc78fddcaa39e29daa532a32815d6.zip
opensim-SC_OLD-389077345f9fc78fddcaa39e29daa532a32815d6.tar.gz
opensim-SC_OLD-389077345f9fc78fddcaa39e29daa532a32815d6.tar.bz2
opensim-SC_OLD-389077345f9fc78fddcaa39e29daa532a32815d6.tar.xz
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index 6c73d91..81f1ff6 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -38,6 +38,13 @@
        <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"/>
+        <RegionModule id="SunModule" type="OpenSim.Region.CoreModules.SunModule"/>
+        <RegionModule id="WindModule" type="OpenSim.Region.CoreModules.WindModule"/>
+        <RegionModule id="MapSearchModule" type="OpenSim.Region.CoreModules.World.WorldMap.MapSearchModule"/>
+        <RegionModule id="VegetationModule" type="OpenSim.Region.CoreModules.Avatar.Vegetation.VegetationModule"/>
+        <RegionModule id="IPBanModule" type="OpenSim.Region.CoreModules.Agent.IPBan.IPBanModule"/>
+        <RegionModule id="J2KDecoderModule" type="OpenSim.Region.CoreModules.Agent.TextureSender.J2KDecoderModule"/>
+        <RegionModule id="CloudModule" type="OpenSim.Region.CoreModules.CloudModule"/>
      <!-- Service connectors OUT modules -->
        <RegionModule id="LocalAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.LocalAssetServicesConnector" />
        <RegionModule id="RemoteAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.RemoteAssetServicesConnector" />
author	Melanie	2012-11-11 16:31:01 +0000
committer	Melanie	2012-11-11 16:31:01 +0000
commit	389077345f9fc78fddcaa39e29daa532a32815d6 (patch)
tree	a455d88d93ac5fe984ebf5342276ca1ddc831442 /OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
parent	Merge branch 'master' into careminster (diff)
parent	Deleted 2 obsolete modules: OGSRadmin and OpenGridProtocol. They were still I... (diff)
download	opensim-SC_OLD-389077345f9fc78fddcaa39e29daa532a32815d6.zip opensim-SC_OLD-389077345f9fc78fddcaa39e29daa532a32815d6.tar.gz opensim-SC_OLD-389077345f9fc78fddcaa39e29daa532a32815d6.tar.bz2 opensim-SC_OLD-389077345f9fc78fddcaa39e29daa532a32815d6.tar.xz

diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml index 6c73d91..81f1ff6 100644 --- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml +++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -38,6 +38,13 @@
38	<RegionModule id="GlynnTuckerAssetCache" type="OpenSim.Region.CoreModules.Asset.GlynnTuckerAssetCache" />	38	<RegionModule id="GlynnTuckerAssetCache" type="OpenSim.Region.CoreModules.Asset.GlynnTuckerAssetCache" />
39	<RegionModule id="CenomeMemoryAssetCache" type="OpenSim.Region.CoreModules.Asset.CenomeMemoryAssetCache"/>	39	<RegionModule id="CenomeMemoryAssetCache" type="OpenSim.Region.CoreModules.Asset.CenomeMemoryAssetCache"/>
40	<RegionModule id="LibraryModule" type="OpenSim.Region.CoreModules.Framework.Library.LibraryModule"/>	40	<RegionModule id="LibraryModule" type="OpenSim.Region.CoreModules.Framework.Library.LibraryModule"/>
		41	<RegionModule id="SunModule" type="OpenSim.Region.CoreModules.SunModule"/>
		42	<RegionModule id="WindModule" type="OpenSim.Region.CoreModules.WindModule"/>
		43	<RegionModule id="MapSearchModule" type="OpenSim.Region.CoreModules.World.WorldMap.MapSearchModule"/>
		44	<RegionModule id="VegetationModule" type="OpenSim.Region.CoreModules.Avatar.Vegetation.VegetationModule"/>
		45	<RegionModule id="IPBanModule" type="OpenSim.Region.CoreModules.Agent.IPBan.IPBanModule"/>
		46	<RegionModule id="J2KDecoderModule" type="OpenSim.Region.CoreModules.Agent.TextureSender.J2KDecoderModule"/>
		47	<RegionModule id="CloudModule" type="OpenSim.Region.CoreModules.CloudModule"/>
41	<!-- Service connectors OUT modules -->	48	<!-- Service connectors OUT modules -->
42	<RegionModule id="LocalAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.LocalAssetServicesConnector" />	49	<RegionModule id="LocalAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.LocalAssetServicesConnector" />
43	<RegionModule id="RemoteAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.RemoteAssetServicesConnector" />	50	<RegionModule id="RemoteAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.RemoteAssetServicesConnector" />