diff options
| author | Melanie | 2012-03-27 18:11:05 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-27 18:11:05 +0100 |
| commit | 6b5f3b49e783be3012f84d25bd986927c5a3e3e7 (patch) | |
| tree | 35187e0f7c0bb0ca7b712e02b56c91ae5ecfd3ee /OpenSim/Server/Handlers | |
| parent | Replace HG linker with core version (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-6b5f3b49e783be3012f84d25bd986927c5a3e3e7.zip opensim-SC_OLD-6b5f3b49e783be3012f84d25bd986927c5a3e3e7.tar.gz opensim-SC_OLD-6b5f3b49e783be3012f84d25bd986927c5a3e3e7.tar.bz2 opensim-SC_OLD-6b5f3b49e783be3012f84d25bd986927c5a3e3e7.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Server/Handlers')
| -rw-r--r-- | OpenSim/Server/Handlers/Asset/AssetServerConnector.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs index 8b9e749..46b0c67 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs | |||
| @@ -59,7 +59,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
| 59 | if (assetService == String.Empty) | 59 | if (assetService == String.Empty) |
| 60 | throw new Exception("No LocalServiceModule in config file"); | 60 | throw new Exception("No LocalServiceModule in config file"); |
| 61 | 61 | ||
| 62 | Object[] args = new Object[] { config }; | 62 | Object[] args = new Object[] { config, m_ConfigName }; |
| 63 | m_AssetService = | 63 | m_AssetService = |
| 64 | ServerUtils.LoadPlugin<IAssetService>(assetService, args); | 64 | ServerUtils.LoadPlugin<IAssetService>(assetService, args); |
| 65 | 65 | ||
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs index 9d6f964..040c840 100644 --- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs +++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | |||
| @@ -67,7 +67,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
| 67 | if (inventoryService == String.Empty) | 67 | if (inventoryService == String.Empty) |
| 68 | throw new Exception("No InventoryService in config file"); | 68 | throw new Exception("No InventoryService in config file"); |
| 69 | 69 | ||
| 70 | Object[] args = new Object[] { config }; | 70 | Object[] args = new Object[] { config, m_ConfigName }; |
| 71 | m_InventoryService = | 71 | m_InventoryService = |
| 72 | ServerUtils.LoadPlugin<IInventoryService>(inventoryService, args); | 72 | ServerUtils.LoadPlugin<IInventoryService>(inventoryService, args); |
| 73 | 73 | ||