diff options
Diffstat (limited to 'OpenSim/Grid/InventoryServer')
-rw-r--r-- | OpenSim/Grid/InventoryServer/Main.cs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs index fda1c96..f62bdf5 100644 --- a/OpenSim/Grid/InventoryServer/Main.cs +++ b/OpenSim/Grid/InventoryServer/Main.cs | |||
@@ -42,7 +42,6 @@ namespace OpenSim.Grid.InventoryServer | |||
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 InventoryConfig m_config; | ||
46 | private GridInventoryService m_inventoryService; | 45 | private GridInventoryService m_inventoryService; |
47 | 46 | ||
48 | public const string LogName = "INVENTORY"; | 47 | public const string LogName = "INVENTORY"; |
@@ -68,15 +67,15 @@ namespace OpenSim.Grid.InventoryServer | |||
68 | { | 67 | { |
69 | base.Startup(); | 68 | base.Startup(); |
70 | 69 | ||
71 | m_config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml"))); | 70 | InventoryConfig config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml"))); |
72 | 71 | ||
73 | m_inventoryService = new GridInventoryService(m_config.UserServerURL); | 72 | m_inventoryService = new GridInventoryService(config.UserServerURL); |
74 | m_inventoryService.DoLookup = m_config.SessionLookUp; | 73 | m_inventoryService.DoLookup = config.SessionLookUp; |
75 | m_inventoryService.AddPlugin(m_config.DatabaseProvider, m_config.DatabaseConnect); | 74 | m_inventoryService.AddPlugin(config.DatabaseProvider, config.DatabaseConnect); |
76 | 75 | ||
77 | m_log.Info("[" + LogName + "]: Starting HTTP server ..."); | 76 | m_log.Info("[" + LogName + "]: Starting HTTP server ..."); |
78 | 77 | ||
79 | m_httpServer = new BaseHttpServer(m_config.HttpPort); | 78 | m_httpServer = new BaseHttpServer(config.HttpPort); |
80 | AddHttpHandlers(); | 79 | AddHttpHandlers(); |
81 | m_httpServer.Start(); | 80 | m_httpServer.Start(); |
82 | 81 | ||