aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs (renamed from OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2ServerConnector.cs)32
1 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2ServerConnector.cs b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs
index 5bab52f..d42de56 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory2/FetchInventory2ServerConnector.cs
+++ b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesServerConnector.cs
@@ -35,13 +35,13 @@ using OpenMetaverse;
35 35
36namespace OpenSim.Capabilities.Handlers 36namespace OpenSim.Capabilities.Handlers
37{ 37{
38 public class FetchInventory2ServerConnector : ServiceConnector 38 public class GetDisplayNamesServerConnector : ServiceConnector
39 { 39 {
40 private IInventoryService m_InventoryService; 40 private IUserManagement m_UserManagement;
41 private string m_ConfigName = "CapsService"; 41 private string m_ConfigName = "CapsService";
42 42
43 public FetchInventory2ServerConnector(IConfigSource config, IHttpServer server, string configName) 43 public GetDisplayNamesServerConnector(IConfigSource config, IHttpServer server, string configName) :
44 : base(config, server, configName) 44 base(config, server, configName)
45 { 45 {
46 if (configName != String.Empty) 46 if (configName != String.Empty)
47 m_ConfigName = configName; 47 m_ConfigName = configName;
@@ -50,22 +50,22 @@ namespace OpenSim.Capabilities.Handlers
50 if (serverConfig == null) 50 if (serverConfig == null)
51 throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName)); 51 throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
52 52
53 string invService = serverConfig.GetString("InventoryService", String.Empty); 53 string umService = serverConfig.GetString("AssetService", String.Empty);
54 54
55 if (invService == String.Empty) 55 if (umService == String.Empty)
56 throw new Exception("No InventoryService in config file"); 56 throw new Exception("No AssetService in config file");
57 57
58 Object[] args = new Object[] { config }; 58 Object[] args = new Object[] { config };
59 m_InventoryService = ServerUtils.LoadPlugin<IInventoryService>(invService, args); 59 m_UserManagement =
60 ServerUtils.LoadPlugin<IUserManagement>(umService, args);
60 61
61 if (m_InventoryService == null) 62 if (m_UserManagement == null)
62 throw new Exception(String.Format("Failed to load InventoryService from {0}; config is {1}", invService, m_ConfigName)); 63 throw new Exception(String.Format("Failed to load UserManagement from {0}; config is {1}", umService, m_ConfigName));
63 64
64 FetchInventory2Handler fiHandler = new FetchInventory2Handler(m_InventoryService); 65 string rurl = serverConfig.GetString("GetTextureRedirectURL");
65 IRequestHandler reqHandler 66
66 = new RestStreamHandler( 67 server.AddStreamHandler(
67 "POST", "/CAPS/FetchInventory/", fiHandler.FetchInventoryRequest, "FetchInventory", null); 68 new GetDisplayNamesHandler("/CAPS/agents/", m_UserManagement, "GetDisplayNames", null));
68 server.AddStreamHandler(reqHandler);
69 } 69 }
70 } 70 }
71} 71} \ No newline at end of file