Merge branch 'master' into bigmerge

author: Melanie 2011-10-12 09:26:35 +0100
committer: Melanie 2011-10-12 09:26:35 +0100
commit: d2dc2316c2a65cffe4c6bc16b337f1e50a1444bd (patch)
tree: b7ec103d17b544a614bf6159b6631ad5f96f8ebf /OpenSim
parent: Make WALK animation state work again. TURNLEFT and TURNRIGHT are now rebroken (diff)
parent: Update OpenSimDefaults.ini to make the prior state (Groups messaging enabled (diff)
download: opensim-SC_OLD-d2dc2316c2a65cffe4c6bc16b337f1e50a1444bd.zip
opensim-SC_OLD-d2dc2316c2a65cffe4c6bc16b337f1e50a1444bd.tar.gz
opensim-SC_OLD-d2dc2316c2a65cffe4c6bc16b337f1e50a1444bd.tar.bz2
opensim-SC_OLD-d2dc2316c2a65cffe4c6bc16b337f1e50a1444bd.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
index 0800e98..a12e6ea 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                // if groups aren't enabled, we're not needed.
                // if we're not specified as the connector to use, then we're not wanted
                if ((groupsConfig.GetBoolean("Enabled", false) == false)
-                     || (groupsConfig.GetString("MessagingModule", "GroupsMessagingModule") != Name))
+                     || (groupsConfig.GetString("MessagingModule", "") != Name))
                {
                    m_groupMessagingEnabled = false;
                    return;
author	Melanie	2011-10-12 09:26:35 +0100
committer	Melanie	2011-10-12 09:26:35 +0100
commit	d2dc2316c2a65cffe4c6bc16b337f1e50a1444bd (patch)
tree	b7ec103d17b544a614bf6159b6631ad5f96f8ebf /OpenSim
parent	Make WALK animation state work again. TURNLEFT and TURNRIGHT are now rebroken (diff)
parent	Update OpenSimDefaults.ini to make the prior state (Groups messaging enabled (diff)
download	opensim-SC_OLD-d2dc2316c2a65cffe4c6bc16b337f1e50a1444bd.zip opensim-SC_OLD-d2dc2316c2a65cffe4c6bc16b337f1e50a1444bd.tar.gz opensim-SC_OLD-d2dc2316c2a65cffe4c6bc16b337f1e50a1444bd.tar.bz2 opensim-SC_OLD-d2dc2316c2a65cffe4c6bc16b337f1e50a1444bd.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs index 0800e98..a12e6ea 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
70	// if groups aren't enabled, we're not needed.	70	// if groups aren't enabled, we're not needed.
71	// if we're not specified as the connector to use, then we're not wanted	71	// if we're not specified as the connector to use, then we're not wanted
72	if ((groupsConfig.GetBoolean("Enabled", false) == false)	72	if ((groupsConfig.GetBoolean("Enabled", false) == false)
73	\|\| (groupsConfig.GetString("MessagingModule", "GroupsMessagingModule") != Name))	73	\|\| (groupsConfig.GetString("MessagingModule", "") != Name))
74	{	74	{
75	m_groupMessagingEnabled = false;	75	m_groupMessagingEnabled = false;
76	return;	76	return;