diff options
| author | Justin Clark-Casey (justincc) | 2012-03-09 00:19:42 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-03-09 00:19:42 +0000 |
| commit | 034c9d6bcc697a1b0e3702d4281235a0eb4d5d4e (patch) | |
| tree | b02db4d4281e1cb537479a98f42e99e978a9752f /OpenSim/Region/CoreModules | |
| parent | Move "change region" command into general category (diff) | |
| parent | minor: move some compression related var setup inside compression if/then switch (diff) | |
| download | opensim-SC-034c9d6bcc697a1b0e3702d4281235a0eb4d5d4e.zip opensim-SC-034c9d6bcc697a1b0e3702d4281235a0eb4d5d4e.tar.gz opensim-SC-034c9d6bcc697a1b0e3702d4281235a0eb4d5d4e.tar.bz2 opensim-SC-034c9d6bcc697a1b0e3702d4281235a0eb4d5d4e.tar.xz | |
Merge branch 'xassetservice'
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs index 2e6ec90..c78915f 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs | |||
| @@ -73,14 +73,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset | |||
| 73 | return; | 73 | return; |
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | string serviceDll = assetConfig.GetString("LocalServiceModule", | 76 | string serviceDll = assetConfig.GetString("LocalServiceModule", String.Empty); |
| 77 | String.Empty); | ||
| 78 | 77 | ||
| 79 | if (serviceDll == String.Empty) | 78 | if (serviceDll == String.Empty) |
| 80 | { | 79 | { |
| 81 | m_log.Error("[LOCAL ASSET SERVICES CONNECTOR]: No LocalServiceModule named in section AssetService"); | 80 | m_log.Error("[LOCAL ASSET SERVICES CONNECTOR]: No LocalServiceModule named in section AssetService"); |
| 82 | return; | 81 | return; |
| 83 | } | 82 | } |
| 83 | else | ||
| 84 | { | ||
| 85 | m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Loading asset service at {0}", serviceDll); | ||
| 86 | } | ||
| 84 | 87 | ||
| 85 | Object[] args = new Object[] { source }; | 88 | Object[] args = new Object[] { source }; |
| 86 | m_AssetService = ServerUtils.LoadPlugin<IAssetService>(serviceDll, args); | 89 | m_AssetService = ServerUtils.LoadPlugin<IAssetService>(serviceDll, args); |