Merge branch 'master' into vehicles

author: Melanie 2009-10-08 10:32:15 +0100
committer: Melanie 2009-10-08 10:32:15 +0100
commit: f6b8bac0fab3dfc3d25775e51bb89ee10feebb53 (patch)
tree: de16f4c7c14fce6851a4cd9c80117d1cbdd4b38e /OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
parent: Correct a build break caused by an optimization in trunk (diff)
parent: Remove ThreadTrackerTest. It's no longer relevant because the thread (diff)
download: opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.zip
opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.gz
opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.bz2
opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
index bb9a4b2..879cc70 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
                m_log.Info("[RegionAssetService]: Starting...");
-                Object[] args = new Object[] { m_Config, MainServer.Instance };
+                Object[] args = new Object[] { m_Config, MainServer.Instance, string.Empty };
                ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:AssetServiceConnector", args);
            }
author	Melanie	2009-10-08 10:32:15 +0100
committer	Melanie	2009-10-08 10:32:15 +0100
commit	f6b8bac0fab3dfc3d25775e51bb89ee10feebb53 (patch)
tree	de16f4c7c14fce6851a4cd9c80117d1cbdd4b38e /OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
parent	Correct a build break caused by an optimization in trunk (diff)
parent	Remove ThreadTrackerTest. It's no longer relevant because the thread (diff)
download	opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.zip opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.gz opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.bz2 opensim-SC_OLD-f6b8bac0fab3dfc3d25775e51bb89ee10feebb53.tar.xz

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs index bb9a4b2..879cc70 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
98		98
99	m_log.Info("[RegionAssetService]: Starting...");	99	m_log.Info("[RegionAssetService]: Starting...");
100		100
101	Object[] args = new Object[] { m_Config, MainServer.Instance };	101	Object[] args = new Object[] { m_Config, MainServer.Instance, string.Empty };
102		102
103	ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:AssetServiceConnector", args);	103	ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:AssetServiceConnector", args);
104	}	104	}