diff options
author | Diva Canto | 2009-08-09 15:17:42 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-09 15:17:42 -0700 |
commit | a5a5e44246ab2fe220b5a215d54d3d25fe1271f5 (patch) | |
tree | 061cf23d0bbe913c2ff7ee5353f0113936cdc887 /OpenSim | |
parent | Finish the renaming and mae things compile again (diff) | |
download | opensim-SC_OLD-a5a5e44246ab2fe220b5a215d54d3d25fe1271f5.zip opensim-SC_OLD-a5a5e44246ab2fe220b5a215d54d3d25fe1271f5.tar.gz opensim-SC_OLD-a5a5e44246ab2fe220b5a215d54d3d25fe1271f5.tar.bz2 opensim-SC_OLD-a5a5e44246ab2fe220b5a215d54d3d25fe1271f5.tar.xz |
Re-removing 2 lines that got added back on Melanie's commits. git hickup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/InventoryServer/Main.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs index 504563a..6106d93 100644 --- a/OpenSim/Grid/InventoryServer/Main.cs +++ b/OpenSim/Grid/InventoryServer/Main.cs | |||
@@ -84,8 +84,6 @@ namespace OpenSim.Grid.InventoryServer | |||
84 | 84 | ||
85 | m_log.Info("[" + LogName + "]: Started HTTP server"); | 85 | m_log.Info("[" + LogName + "]: Started HTTP server"); |
86 | 86 | ||
87 | new HGInventoryService(m_inventoryService, config.AssetServerURL, config.UserServerURL, m_httpServer, config.InventoryServerURL); | ||
88 | |||
89 | base.StartupSpecific(); | 87 | base.StartupSpecific(); |
90 | 88 | ||
91 | m_console.Commands.AddCommand("inventoryserver", false, "add user", | 89 | m_console.Commands.AddCommand("inventoryserver", false, "add user", |
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml index c0932bd..8e85559 100644 --- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml +++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml | |||
@@ -37,7 +37,6 @@ | |||
37 | <RegionModule id="InventoryServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.InventoryServiceInConnectorModule" /> | 37 | <RegionModule id="InventoryServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.InventoryServiceInConnectorModule" /> |
38 | <RegionModule id="LandServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Land.LandServiceInConnectorModule" /> | 38 | <RegionModule id="LandServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Land.LandServiceInConnectorModule" /> |
39 | <RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour.NeighbourServiceInConnectorModule" /> \ | 39 | <RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour.NeighbourServiceInConnectorModule" /> \ |
40 | <RegionModule id="HGAuthServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication.HGAuthServiceInConnectorModule" /> \ | ||
41 | 40 | ||
42 | </Extension> | 41 | </Extension> |
43 | 42 | ||