diff options
3 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescHandler.cs index b222d4b..3d3340f 100644 --- a/OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescHandler.cs +++ b/OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescHandler.cs | |||
@@ -42,7 +42,7 @@ using Caps = OpenSim.Framework.Capabilities.Caps; | |||
42 | 42 | ||
43 | namespace OpenSim.Capabilities.Handlers | 43 | namespace OpenSim.Capabilities.Handlers |
44 | { | 44 | { |
45 | public class WebFetchInvDescHandler | 45 | public class FetchInvDescHandler |
46 | { | 46 | { |
47 | private static readonly ILog m_log = | 47 | private static readonly ILog m_log = |
48 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 48 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -51,7 +51,7 @@ namespace OpenSim.Capabilities.Handlers | |||
51 | private ILibraryService m_LibraryService; | 51 | private ILibraryService m_LibraryService; |
52 | // private object m_fetchLock = new Object(); | 52 | // private object m_fetchLock = new Object(); |
53 | 53 | ||
54 | public WebFetchInvDescHandler(IInventoryService invService, ILibraryService libService) | 54 | public FetchInvDescHandler(IInventoryService invService, ILibraryService libService) |
55 | { | 55 | { |
56 | m_InventoryService = invService; | 56 | m_InventoryService = invService; |
57 | m_LibraryService = libService; | 57 | m_LibraryService = libService; |
@@ -211,9 +211,9 @@ namespace OpenSim.Capabilities.Handlers | |||
211 | UUID agentID, UUID folderID, UUID ownerID, | 211 | UUID agentID, UUID folderID, UUID ownerID, |
212 | bool fetchFolders, bool fetchItems, int sortOrder, out int version, out int descendents) | 212 | bool fetchFolders, bool fetchItems, int sortOrder, out int version, out int descendents) |
213 | { | 213 | { |
214 | // m_log.DebugFormat( | 214 | //m_log.DebugFormat( |
215 | // "[WEB FETCH INV DESC HANDLER]: Fetching folders ({0}), items ({1}) from {2} for agent {3}", | 215 | // "[WEB FETCH INV DESC HANDLER]: Fetching folders ({0}), items ({1}) from {2} for agent {3}", |
216 | // fetchFolders, fetchItems, folderID, agentID); | 216 | // fetchFolders, fetchItems, folderID, agentID); |
217 | 217 | ||
218 | // FIXME MAYBE: We're not handling sortOrder! | 218 | // FIXME MAYBE: We're not handling sortOrder! |
219 | 219 | ||
diff --git a/OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescServerConnector.cs b/OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescServerConnector.cs index 5d86557..6fbe173 100644 --- a/OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescServerConnector.cs +++ b/OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescServerConnector.cs | |||
@@ -35,13 +35,13 @@ using OpenMetaverse; | |||
35 | 35 | ||
36 | namespace OpenSim.Capabilities.Handlers | 36 | namespace OpenSim.Capabilities.Handlers |
37 | { | 37 | { |
38 | public class WebFetchInvDescServerConnector : ServiceConnector | 38 | public class FetchInvDescServerConnector : ServiceConnector |
39 | { | 39 | { |
40 | private IInventoryService m_InventoryService; | 40 | private IInventoryService m_InventoryService; |
41 | private ILibraryService m_LibraryService; | 41 | private ILibraryService m_LibraryService; |
42 | private string m_ConfigName = "CapsService"; | 42 | private string m_ConfigName = "CapsService"; |
43 | 43 | ||
44 | public WebFetchInvDescServerConnector(IConfigSource config, IHttpServer server, string configName) : | 44 | public FetchInvDescServerConnector(IConfigSource config, IHttpServer server, string configName) : |
45 | base(config, server, configName) | 45 | base(config, server, configName) |
46 | { | 46 | { |
47 | if (configName != String.Empty) | 47 | if (configName != String.Empty) |
@@ -67,13 +67,13 @@ namespace OpenSim.Capabilities.Handlers | |||
67 | m_LibraryService = | 67 | m_LibraryService = |
68 | ServerUtils.LoadPlugin<ILibraryService>(libService, args); | 68 | ServerUtils.LoadPlugin<ILibraryService>(libService, args); |
69 | 69 | ||
70 | WebFetchInvDescHandler webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService); | 70 | FetchInvDescHandler webFetchHandler = new FetchInvDescHandler(m_InventoryService, m_LibraryService); |
71 | IRequestHandler reqHandler | 71 | IRequestHandler reqHandler |
72 | = new RestStreamHandler( | 72 | = new RestStreamHandler( |
73 | "POST", | 73 | "POST", |
74 | "/CAPS/WebFetchInvDesc/" /*+ UUID.Random()*/, | 74 | "/CAPS/WebFetchInvDesc/" /*+ UUID.Random()*/, |
75 | webFetchHandler.FetchInventoryDescendentsRequest, | 75 | webFetchHandler.FetchInventoryDescendentsRequest, |
76 | "WebFetchInvDesc", | 76 | "FetchInvDescendents", |
77 | null); | 77 | null); |
78 | server.AddStreamHandler(reqHandler); | 78 | server.AddStreamHandler(reqHandler); |
79 | } | 79 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs index 84ca4bb..053a6a2 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs | |||
@@ -94,7 +94,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
94 | private string m_fetchInventoryDescendents2Url; | 94 | private string m_fetchInventoryDescendents2Url; |
95 | private string m_webFetchInventoryDescendentsUrl; | 95 | private string m_webFetchInventoryDescendentsUrl; |
96 | 96 | ||
97 | private static WebFetchInvDescHandler m_webFetchHandler; | 97 | private static FetchInvDescHandler m_webFetchHandler; |
98 | 98 | ||
99 | private static Thread[] m_workerThreads = null; | 99 | private static Thread[] m_workerThreads = null; |
100 | 100 | ||
@@ -197,7 +197,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
197 | m_LibraryService = Scene.LibraryService; | 197 | m_LibraryService = Scene.LibraryService; |
198 | 198 | ||
199 | // We'll reuse the same handler for all requests. | 199 | // We'll reuse the same handler for all requests. |
200 | m_webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService); | 200 | m_webFetchHandler = new FetchInvDescHandler(m_InventoryService, m_LibraryService); |
201 | 201 | ||
202 | Scene.EventManager.OnRegisterCaps += RegisterCaps; | 202 | Scene.EventManager.OnRegisterCaps += RegisterCaps; |
203 | 203 | ||