diff options
Diffstat (limited to 'OpenSim/Grid/InventoryServer/Main.cs')
-rw-r--r-- | OpenSim/Grid/InventoryServer/Main.cs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs index f1bd60f..2279191 100644 --- a/OpenSim/Grid/InventoryServer/Main.cs +++ b/OpenSim/Grid/InventoryServer/Main.cs | |||
@@ -41,8 +41,7 @@ namespace OpenSim.Grid.InventoryServer | |||
41 | public class OpenInventory_Main : BaseOpenSimServer, conscmd_callback | 41 | public class OpenInventory_Main : BaseOpenSimServer, conscmd_callback |
42 | { | 42 | { |
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | 44 | ||
45 | private InventoryManager m_inventoryManager; | ||
46 | private InventoryConfig m_config; | 45 | private InventoryConfig m_config; |
47 | private GridInventoryService m_inventoryService; | 46 | private GridInventoryService m_inventoryService; |
48 | 47 | ||
@@ -71,7 +70,6 @@ namespace OpenSim.Grid.InventoryServer | |||
71 | m_config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml"))); | 70 | m_config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml"))); |
72 | 71 | ||
73 | m_inventoryService = new GridInventoryService(); | 72 | m_inventoryService = new GridInventoryService(); |
74 | // m_inventoryManager = new InventoryManager(); | ||
75 | m_inventoryService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect); | 73 | m_inventoryService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect); |
76 | 74 | ||
77 | m_log.Info("[" + LogName + "]: Starting HTTP server ..."); | 75 | m_log.Info("[" + LogName + "]: Starting HTTP server ..."); |
@@ -121,8 +119,6 @@ namespace OpenSim.Grid.InventoryServer | |||
121 | m_httpServer.AddStreamHandler( | 119 | m_httpServer.AddStreamHandler( |
122 | new RestDeserialisehandler<Guid, List<InventoryFolderBase>> | 120 | new RestDeserialisehandler<Guid, List<InventoryFolderBase>> |
123 | ("POST", "/RootFolders/", m_inventoryService.GetInventorySkeleton)); | 121 | ("POST", "/RootFolders/", m_inventoryService.GetInventorySkeleton)); |
124 | |||
125 | // httpServer.AddStreamHandler(new InventoryManager.GetInventory(m_inventoryManager)); | ||
126 | } | 122 | } |
127 | 123 | ||
128 | private void Work() | 124 | private void Work() |