diff options
author | John Hurliman | 2010-03-16 10:40:15 -0700 |
---|---|---|
committer | John Hurliman | 2010-03-16 10:40:15 -0700 |
commit | d722519b31e702e864745bfcd6bd03e3d38ded21 (patch) | |
tree | a76abd194cc012c8b2fdbd316fe465494a0b54be /OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs | |
parent | Fixed a bad module name in SimianGrid.ini (diff) | |
download | opensim-SC_OLD-d722519b31e702e864745bfcd6bd03e3d38ded21.zip opensim-SC_OLD-d722519b31e702e864745bfcd6bd03e3d38ded21.tar.gz opensim-SC_OLD-d722519b31e702e864745bfcd6bd03e3d38ded21.tar.bz2 opensim-SC_OLD-d722519b31e702e864745bfcd6bd03e3d38ded21.tar.xz |
* Fixing the SimianGrid friend connector enabled detection since the friends module uses a different pattern in the .ini file
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs index 0d87494..89eb72d 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs | |||
@@ -76,7 +76,15 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
76 | 76 | ||
77 | public void Initialise(IConfigSource source) | 77 | public void Initialise(IConfigSource source) |
78 | { | 78 | { |
79 | if (Simian.IsSimianEnabled(source, "FriendsServices", this.Name)) | 79 | bool isSimianEnabled = false; |
80 | |||
81 | if (source.Configs["Friends"] != null) | ||
82 | { | ||
83 | string module = source.Configs["Friends"].GetString("Connector"); | ||
84 | isSimianEnabled = !String.IsNullOrEmpty(module) && module.EndsWith(this.Name); | ||
85 | } | ||
86 | |||
87 | if (isSimianEnabled) | ||
80 | { | 88 | { |
81 | IConfig assetConfig = source.Configs["FriendsService"]; | 89 | IConfig assetConfig = source.Configs["FriendsService"]; |
82 | if (assetConfig == null) | 90 | if (assetConfig == null) |