From d722519b31e702e864745bfcd6bd03e3d38ded21 Mon Sep 17 00:00:00 2001 From: John Hurliman Date: Tue, 16 Mar 2010 10:40:15 -0700 Subject: [PATCH] * Fixing the SimianGrid friend connector enabled detection since the friends module uses a different pattern in the .ini file --- .../SimianGrid/SimianFriendsServiceConnector.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs index 0d87494693..89eb72d143 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs @@ -76,7 +76,15 @@ namespace OpenSim.Services.Connectors.SimianGrid public void Initialise(IConfigSource source) { - if (Simian.IsSimianEnabled(source, "FriendsServices", this.Name)) + bool isSimianEnabled = false; + + if (source.Configs["Friends"] != null) + { + string module = source.Configs["Friends"].GetString("Connector"); + isSimianEnabled = !String.IsNullOrEmpty(module) && module.EndsWith(this.Name); + } + + if (isSimianEnabled) { IConfig assetConfig = source.Configs["FriendsService"]; if (assetConfig == null)