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/OptionalModules/Resources/OptionalModules.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, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml b/OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml
index 8691343..a372d37 100644
--- a/OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml
+++ b/OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml
@@ -14,5 +14,6 @@
      <RegionModule id="VivoxVoice"            type="OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice.VivoxVoiceModule" />
      <RegionModule id="WorldViewModule"            type="OpenSim.Region.OptionalModules.World.WorldView.WorldViewModule" />
      <RegionModule id="AutoBackupModule"      type="OpenSim.Region.OptionalModules.World.AutoBackup.AutoBackupModule" />
+      <RegionModule id="TreePopulatorModule"      type="OpenSim.Region.OptionalModules.World.TreePopulator.TreePopulatorModule" />
    </Extension>
 </Addin>
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/OptionalModules/Resources/OptionalModules.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/OptionalModules/Resources/OptionalModules.addin.xml b/OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml index 8691343..a372d37 100644 --- a/OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml +++ b/OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml
@@ -14,5 +14,6 @@
14	<RegionModule id="VivoxVoice" type="OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice.VivoxVoiceModule" />	14	<RegionModule id="VivoxVoice" type="OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice.VivoxVoiceModule" />
15	<RegionModule id="WorldViewModule" type="OpenSim.Region.OptionalModules.World.WorldView.WorldViewModule" />	15	<RegionModule id="WorldViewModule" type="OpenSim.Region.OptionalModules.World.WorldView.WorldViewModule" />
16	<RegionModule id="AutoBackupModule" type="OpenSim.Region.OptionalModules.World.AutoBackup.AutoBackupModule" />	16	<RegionModule id="AutoBackupModule" type="OpenSim.Region.OptionalModules.World.AutoBackup.AutoBackupModule" />
		17	<RegionModule id="TreePopulatorModule" type="OpenSim.Region.OptionalModules.World.TreePopulator.TreePopulatorModule" />
17	</Extension>	18	</Extension>
18	</Addin>	19	</Addin>