Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim

author: Melanie 2009-08-07 19:01:27 +0100
committer: Melanie 2009-08-07 19:01:27 +0100
commit: 7811bceb8f5e49ac8abf24cff5785e0c2b6ef5af (patch)
tree: d396a21ba49d2e17a5e8a57c225532eca16d622d /OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml
parent: Make the opensim.ini logfile option really work (port of a fix from ROBUST) (diff)
parent: ignore .svn directories, useful for the mirror (diff)
download: opensim-SC_OLD-7811bceb8f5e49ac8abf24cff5785e0c2b6ef5af.zip
opensim-SC_OLD-7811bceb8f5e49ac8abf24cff5785e0c2b6ef5af.tar.gz
opensim-SC_OLD-7811bceb8f5e49ac8abf24cff5785e0c2b6ef5af.tar.bz2
opensim-SC_OLD-7811bceb8f5e49ac8abf24cff5785e0c2b6ef5af.tar.xz
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml b/OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml
index 4b7b39d..389044e 100644
--- a/OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml
+++ b/OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml
@@ -10,8 +10,6 @@
    <Extension path = "/OpenSim/RegionModules">
      <RegionModule id="IRCBridge"             type="OpenSim.Region.OptionalModules.Avatar.Chat.IRCBridgeModule" />
      <RegionModule id="Concierge"             type="OpenSim.Region.OptionalModules.Avatar.Concierge.ConciergeModule" />
-      <RegionModule id="XmlRpcGroups"          type="OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.XmlRpcGroupsModule" />
-      <RegionModule id="XmlRpcGroupsMessaging" type="OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.XmlRpcGroupsMessaging" />
      <RegionModule id="VivoxVoice"            type="OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice.VivoxVoiceModule" />
    </Extension>
 </Addin>
author	Melanie	2009-08-07 19:01:27 +0100
committer	Melanie	2009-08-07 19:01:27 +0100
commit	7811bceb8f5e49ac8abf24cff5785e0c2b6ef5af (patch)
tree	d396a21ba49d2e17a5e8a57c225532eca16d622d /OpenSim/Region/OptionalModules/Resources/OptionalModules.addin.xml
parent	Make the opensim.ini logfile option really work (port of a fix from ROBUST) (diff)
parent	ignore .svn directories, useful for the mirror (diff)
download	opensim-SC_OLD-7811bceb8f5e49ac8abf24cff5785e0c2b6ef5af.zip opensim-SC_OLD-7811bceb8f5e49ac8abf24cff5785e0c2b6ef5af.tar.gz opensim-SC_OLD-7811bceb8f5e49ac8abf24cff5785e0c2b6ef5af.tar.bz2 opensim-SC_OLD-7811bceb8f5e49ac8abf24cff5785e0c2b6ef5af.tar.xz