Merge branch 'master' into bulletsim

author: Dan Lake 2011-07-11 12:23:20 -0700
committer: Dan Lake 2011-07-11 12:23:20 -0700
commit: b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a (patch)
tree: 8fd2fa4567e2882e7f5dafdb8cf1de571917f23a /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups
parent: Checkin 32 bit bulletsim shared library for Linux. (diff)
parent: minor Tack the prim name on the end of the "experimental mesh proxy generatio... (diff)
download: opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.zip
opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.gz
opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.bz2
opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.xz
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs
index 2bf8489..0800e98 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", "Default") != Name))
+                     || (groupsConfig.GetString("MessagingModule", "GroupsMessagingModule") != Name))
                {
                    m_groupMessagingEnabled = false;
                    return;
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
index 02751ea..42008da 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
@@ -200,7 +200,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("ServicesConnectorModule", "Default") != Name))
+                    || (groupsConfig.GetString("ServicesConnectorModule", "XmlRpcGroupsServicesConnector") != Name))
                {
                    m_connectorEnabled = false;
                    return;
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
index 2631ac1..a08bcd0 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -109,7 +109,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("ServicesConnectorModule", "Default") != Name))
+                    || (groupsConfig.GetString("ServicesConnectorModule", "XmlRpcGroupsServicesConnector") != Name))
                {
                    m_connectorEnabled = false;
                    return;
author	Dan Lake	2011-07-11 12:23:20 -0700
committer	Dan Lake	2011-07-11 12:23:20 -0700
commit	b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a (patch)
tree	8fd2fa4567e2882e7f5dafdb8cf1de571917f23a /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups
parent	Checkin 32 bit bulletsim shared library for Linux. (diff)
parent	minor Tack the prim name on the end of the "experimental mesh proxy generatio... (diff)
download	opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.zip opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.gz opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.bz2 opensim-SC_OLD-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs index 2bf8489..0800e98 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", "Default") != Name))	73	\|\| (groupsConfig.GetString("MessagingModule", "GroupsMessagingModule") != Name))
74	{	74	{
75	m_groupMessagingEnabled = false;	75	m_groupMessagingEnabled = false;
76	return;	76	return;


diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs index 02751ea..42008da 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
@@ -200,7 +200,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
200	// if groups aren't enabled, we're not needed.	200	// if groups aren't enabled, we're not needed.
201	// if we're not specified as the connector to use, then we're not wanted	201	// if we're not specified as the connector to use, then we're not wanted
202	if ((groupsConfig.GetBoolean("Enabled", false) == false)	202	if ((groupsConfig.GetBoolean("Enabled", false) == false)
203	\|\| (groupsConfig.GetString("ServicesConnectorModule", "Default") != Name))	203	\|\| (groupsConfig.GetString("ServicesConnectorModule", "XmlRpcGroupsServicesConnector") != Name))
204	{	204	{
205	m_connectorEnabled = false;	205	m_connectorEnabled = false;
206	return;	206	return;


diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs index 2631ac1..a08bcd0 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs
@@ -109,7 +109,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
109	// if groups aren't enabled, we're not needed.	109	// if groups aren't enabled, we're not needed.
110	// if we're not specified as the connector to use, then we're not wanted	110	// if we're not specified as the connector to use, then we're not wanted
111	if ((groupsConfig.GetBoolean("Enabled", false) == false)	111	if ((groupsConfig.GetBoolean("Enabled", false) == false)
112	\|\| (groupsConfig.GetString("ServicesConnectorModule", "Default") != Name))	112	\|\| (groupsConfig.GetString("ServicesConnectorModule", "XmlRpcGroupsServicesConnector") != Name))
113	{	113	{
114	m_connectorEnabled = false;	114	m_connectorEnabled = false;
115	return;	115	return;