ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2012-03-27 18:11:05 +01:00
parent 0964af41be 2e2634896d
commit 6b5f3b49e7
17 changed files with 91 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Server/Handlers/Asset/AssetServerConnector.cs
View File

@@ -59,7 +59,7 @@ namespace OpenSim.Server.Handlers.Asset
if (assetService == String.Empty)
throw new Exception("No LocalServiceModule in config file");
Object[] args = new Object[] { config };
Object[] args = new Object[] { config, m_ConfigName };
m_AssetService =
ServerUtils.LoadPlugin<IAssetService>(assetService, args);

2
OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
View File

@@ -67,7 +67,7 @@ namespace OpenSim.Server.Handlers.Asset
if (inventoryService == String.Empty)
throw new Exception("No InventoryService in config file");
Object[] args = new Object[] { config };
Object[] args = new Object[] { config, m_ConfigName };
m_InventoryService =
ServerUtils.LoadPlugin<IInventoryService>(inventoryService, args);