aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-12 19:24:03 +0100
committerJustin Clark-Casey (justincc)2011-10-12 19:24:03 +0100
commit36e73dbc9b7fb46885865f5537c43a29239fd559 (patch)
tree4e9221a18dead97483f0d8e0da2b40864d342b6d /OpenSim/Region
parentImprove some method doc for LLUDPClient, LLUDPServer and UnackedPacketCollection (diff)
parentMake it possible to disable the HG linker. On non-HG systems it spits yellow (diff)
downloadopensim-SC_OLD-36e73dbc9b7fb46885865f5537c43a29239fd559.zip
opensim-SC_OLD-36e73dbc9b7fb46885865f5537c43a29239fd559.tar.gz
opensim-SC_OLD-36e73dbc9b7fb46885865f5537c43a29239fd559.tar.bz2
opensim-SC_OLD-36e73dbc9b7fb46885865f5537c43a29239fd559.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs2
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
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;