diff options
author | Jonathan Freedman | 2010-10-07 23:47:39 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-07 23:47:39 -0400 |
commit | 4adada6fe48a960850639628c0f90e55c848235f (patch) | |
tree | 63f616d32f35012fe278a8cdeb9b3e762ecde37a /OpenSim/Region/OptionalModules/Resources | |
parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-4adada6fe48a960850639628c0f90e55c848235f.zip opensim-SC_OLD-4adada6fe48a960850639628c0f90e55c848235f.tar.gz opensim-SC_OLD-4adada6fe48a960850639628c0f90e55c848235f.tar.bz2 opensim-SC_OLD-4adada6fe48a960850639628c0f90e55c848235f.tar.xz |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/Resources')
-rw-r--r-- | OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml | 1 |
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 352052a..5eea286 100644 --- a/OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml +++ b/OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml | |||
@@ -12,5 +12,6 @@ | |||
12 | <RegionModule id="IRCBridge" type="OpenSim.Region.OptionalModules.Avatar.Chat.IRCBridgeModule" /> | 12 | <RegionModule id="IRCBridge" type="OpenSim.Region.OptionalModules.Avatar.Chat.IRCBridgeModule" /> |
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 | </Extension> | 16 | </Extension> |
16 | </Addin> | 17 | </Addin> |