diff options
| author | Kitto Flora | 2010-03-19 19:14:09 -0400 |
|---|---|---|
| committer | Kitto Flora | 2010-03-19 19:14:09 -0400 |
| commit | 0f5fb6f1901b0950ac52446702b07c91d16724d7 (patch) | |
| tree | 72305ac8d95eccd4e7432538f061429e25e3418d /OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |
| parent | Fix AbsolutePosition for autopilot/sit. (diff) | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-0f5fb6f1901b0950ac52446702b07c91d16724d7.zip opensim-SC-0f5fb6f1901b0950ac52446702b07c91d16724d7.tar.gz opensim-SC-0f5fb6f1901b0950ac52446702b07c91d16724d7.tar.bz2 opensim-SC-0f5fb6f1901b0950ac52446702b07c91d16724d7.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster 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) |