Merge branch 'master' of /home/opensim/src/OpenSim/Core

author: BlueWall 2011-02-12 20:42:11 -0500
committer: BlueWall 2011-02-12 20:42:11 -0500
commit: c0e1742d479d4390701688da685892555f28bfbc (patch)
tree: 39d717dd9ce4c453898eca2237f9fc2d2879c1d4 /OpenSim/Region/CoreModules/Resources
parent: Merge branch 'master' of /home/opensim/src/OpenSim/Core (diff)
parent: Fixed a couple of tests in the HttpServer. Not sure if this is enough. Mantis... (diff)
download: opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.zip
opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.tar.gz
opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.tar.bz2
opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.tar.xz
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index 43de2ab..a9d247a 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -47,7 +47,6 @@
        <RegionModule id="RemoteAuthorizationServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization.RemoteAuthorizationServicesConnector" />
        <RegionModule id="HGAssetBroker" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.HGAssetBroker" />
        <RegionModule id="LocalInventoryServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.LocalInventoryServicesConnector" />
-        <RegionModule id="RemoteInventoryServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.RemoteInventoryServicesConnector" />
        <RegionModule id="RemoteXInventoryServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.RemoteXInventoryServicesConnector" />
        <RegionModule id="HGInventoryBroker" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.HGInventoryBroker" />
        <RegionModule id="LocalNeighbourServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour.LocalNeighbourServicesConnector" />
author	BlueWall	2011-02-12 20:42:11 -0500
committer	BlueWall	2011-02-12 20:42:11 -0500
commit	c0e1742d479d4390701688da685892555f28bfbc (patch)
tree	39d717dd9ce4c453898eca2237f9fc2d2879c1d4 /OpenSim/Region/CoreModules/Resources
parent	Merge branch 'master' of /home/opensim/src/OpenSim/Core (diff)
parent	Fixed a couple of tests in the HttpServer. Not sure if this is enough. Mantis... (diff)
download	opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.zip opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.tar.gz opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.tar.bz2 opensim-SC_OLD-c0e1742d479d4390701688da685892555f28bfbc.tar.xz

diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml index 43de2ab..a9d247a 100644 --- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml +++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -47,7 +47,6 @@
47	<RegionModule id="RemoteAuthorizationServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization.RemoteAuthorizationServicesConnector" />	47	<RegionModule id="RemoteAuthorizationServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization.RemoteAuthorizationServicesConnector" />
48	<RegionModule id="HGAssetBroker" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.HGAssetBroker" />	48	<RegionModule id="HGAssetBroker" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.HGAssetBroker" />
49	<RegionModule id="LocalInventoryServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.LocalInventoryServicesConnector" />	49	<RegionModule id="LocalInventoryServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.LocalInventoryServicesConnector" />
50	<RegionModule id="RemoteInventoryServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.RemoteInventoryServicesConnector" />
51	<RegionModule id="RemoteXInventoryServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.RemoteXInventoryServicesConnector" />	50	<RegionModule id="RemoteXInventoryServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.RemoteXInventoryServicesConnector" />
52	<RegionModule id="HGInventoryBroker" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.HGInventoryBroker" />	51	<RegionModule id="HGInventoryBroker" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory.HGInventoryBroker" />
53	<RegionModule id="LocalNeighbourServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour.LocalNeighbourServicesConnector" />	52	<RegionModule id="LocalNeighbourServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour.LocalNeighbourServicesConnector" />