aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/InventoryServer/Main.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid/InventoryServer/Main.cs')
-rw-r--r--OpenSim/Grid/InventoryServer/Main.cs9
1 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index e4cd446..07fb19c 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -33,6 +33,7 @@ using log4net;
33using log4net.Config; 33using log4net.Config;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications.Services;
36using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
37using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
38 39
@@ -43,6 +44,7 @@ namespace OpenSim.Grid.InventoryServer
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 private GridInventoryService m_inventoryService; 46 private GridInventoryService m_inventoryService;
47 private HGInventoryService m_directInventoryService;
46 48
47 public const string LogName = "INVENTORY"; 49 public const string LogName = "INVENTORY";
48 50
@@ -70,14 +72,19 @@ namespace OpenSim.Grid.InventoryServer
70 m_inventoryService.DoLookup = config.SessionLookUp; 72 m_inventoryService.DoLookup = config.SessionLookUp;
71 m_inventoryService.AddPlugin(config.DatabaseProvider, config.DatabaseConnect); 73 m_inventoryService.AddPlugin(config.DatabaseProvider, config.DatabaseConnect);
72 74
75
73 m_log.Info("[" + LogName + "]: Starting HTTP server ..."); 76 m_log.Info("[" + LogName + "]: Starting HTTP server ...");
74 77
75 m_httpServer = new BaseHttpServer(config.HttpPort); 78 m_httpServer = new BaseHttpServer(config.HttpPort);
76 AddHttpHandlers(); 79 if (config.RegionAccessToAgentsInventory)
80 AddHttpHandlers();
81
77 m_httpServer.Start(); 82 m_httpServer.Start();
78 83
79 m_log.Info("[" + LogName + "]: Started HTTP server"); 84 m_log.Info("[" + LogName + "]: Started HTTP server");
80 85
86 m_directInventoryService = new HGInventoryService(m_inventoryService, config.AssetServerURL, config.UserServerURL, m_httpServer, config.InventoryServerURL);
87
81 base.StartupSpecific(); 88 base.StartupSpecific();
82 89
83 m_console.Commands.AddCommand("inventoryserver", false, "add user", 90 m_console.Commands.AddCommand("inventoryserver", false, "add user",