diff options
| author | Melanie | 2010-03-18 20:09:04 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-18 20:09:04 +0000 |
| commit | 4c2a51b1b5e2169e0f336c56a023c35bcc334cbd (patch) | |
| tree | 9fbaf708764f315034a283fd8fedc8afe0864d75 /OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |
| parent | Merge branch 'careminster' into careminster-presence-refactor (diff) | |
| parent | Flesh out the new permission method (diff) | |
| download | opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.zip opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.gz opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.bz2 opensim-SC-4c2a51b1b5e2169e0f336c56a023c35bcc334cbd.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs')
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs index 1c22a72..c5fbc9e 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |||
| @@ -85,7 +85,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
| 85 | 85 | ||
| 86 | public void Initialise(IConfigSource source) | 86 | public void Initialise(IConfigSource source) |
| 87 | { | 87 | { |
| 88 | if (Simian.IsSimianEnabled(source, "AssetServices")) | 88 | if (Simian.IsSimianEnabled(source, "AssetServices", this.Name)) |
| 89 | { | 89 | { |
| 90 | IConfig gridConfig = source.Configs["AssetService"]; | 90 | IConfig gridConfig = source.Configs["AssetService"]; |
| 91 | if (gridConfig == null) | 91 | if (gridConfig == null) |