aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml
diff options
context:
space:
mode:
authorMelanie2011-05-08 20:20:40 +0100
committerMelanie2011-05-08 20:20:40 +0100
commit1be67914fab348115faa1fc9e9ecffbf7c303093 (patch)
tree7ad4917efae6aebeefa51fe03b1d1aac3e95efcb /OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml
parentEnable compressed (gzip) fatpack transfers. (diff)
parentMantis #5472 (diff)
downloadopensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.zip
opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.gz
opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.bz2
opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml')
-rw-r--r--OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml1
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 5eea286..8691343 100644
--- a/OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml
+++ b/OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml
@@ -13,5 +13,6 @@
13 <RegionModule id="Concierge" type="OpenSim.Region.OptionalModules.Avatar.Concierge.ConciergeModule" /> 13 <RegionModule id="Concierge" type="OpenSim.Region.OptionalModules.Avatar.Concierge.ConciergeModule" />
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 </Extension> 17 </Extension>
17</Addin> 18</Addin>