diff options
| author | Melanie | 2010-06-29 20:36:36 +0100 |
|---|---|---|
| committer | Melanie | 2010-06-29 20:36:36 +0100 |
| commit | 5d11833ae1969718187c23b9d29ebd233ecbb401 (patch) | |
| tree | 3be12b67f0c1198a10c2e15afbfffa32b8a4f77f /OpenSim/Region/CoreModules/ServiceConnectorsIn | |
| parent | Fix a nullref on autoreturn (diff) | |
| parent | stop exceptions in setting and getting state from propogating since they aren... (diff) | |
| download | opensim-SC-5d11833ae1969718187c23b9d29ebd233ecbb401.zip opensim-SC-5d11833ae1969718187c23b9d29ebd233ecbb401.tar.gz opensim-SC-5d11833ae1969718187c23b9d29ebd233ecbb401.tar.bz2 opensim-SC-5d11833ae1969718187c23b9d29ebd233ecbb401.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsIn')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs index ae03cdf..209cf0d 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs | |||
| @@ -96,7 +96,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory | |||
| 96 | 96 | ||
| 97 | Object[] args = new Object[] { m_Config, MainServer.Instance, "HGInventoryService" }; | 97 | Object[] args = new Object[] { m_Config, MainServer.Instance, "HGInventoryService" }; |
| 98 | 98 | ||
| 99 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector", args); | 99 | ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:XInventoryInConnector", args); |
| 100 | } | 100 | } |
| 101 | } | 101 | } |
| 102 | 102 | ||