From a5a5e44246ab2fe220b5a215d54d3d25fe1271f5 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 9 Aug 2009 15:17:42 -0700
Subject: Re-removing 2 lines that got added back on Melanie's commits. git
hickup.
---
OpenSim/Grid/InventoryServer/Main.cs | 2 --
OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml | 1 -
2 files changed, 3 deletions(-)
(limited to 'OpenSim')
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
m_log.Info("[" + LogName + "]: Started HTTP server");
- new HGInventoryService(m_inventoryService, config.AssetServerURL, config.UserServerURL, m_httpServer, config.InventoryServerURL);
-
base.StartupSpecific();
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 @@
\
- \
--
cgit v1.1