OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

And finally renamed the classes themselves.

sedebug
Diva Canto 2015-01-13 22:21:50 -08:00
parent 034fc325c0
commit 8cc590cf80
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescHandler.cs
View File

@ -42,7 +42,7 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
namespace OpenSim.Capabilities.Handlers namespace OpenSim.Capabilities.Handlers
{ {
public class WebFetchInvDescHandler public class FetchInvDescHandler
{ {
private static readonly ILog m_log = private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@ -51,7 +51,7 @@ namespace OpenSim.Capabilities.Handlers
private ILibraryService m_LibraryService; private ILibraryService m_LibraryService;
// private object m_fetchLock = new Object(); // private object m_fetchLock = new Object();
public WebFetchInvDescHandler(IInventoryService invService, ILibraryService libService) public FetchInvDescHandler(IInventoryService invService, ILibraryService libService)
{ {
m_InventoryService = invService; m_InventoryService = invService;
m_LibraryService = libService; m_LibraryService = libService;
@ -211,9 +211,9 @@ namespace OpenSim.Capabilities.Handlers
UUID agentID, UUID folderID, UUID ownerID, UUID agentID, UUID folderID, UUID ownerID,
bool fetchFolders, bool fetchItems, int sortOrder, out int version, out int descendents) bool fetchFolders, bool fetchItems, int sortOrder, out int version, out int descendents)
{ {
// m_log.DebugFormat( //m_log.DebugFormat(
// "[WEB FETCH INV DESC HANDLER]: Fetching folders ({0}), items ({1}) from {2} for agent {3}", // "[WEB FETCH INV DESC HANDLER]: Fetching folders ({0}), items ({1}) from {2} for agent {3}",
// fetchFolders, fetchItems, folderID, agentID); // fetchFolders, fetchItems, folderID, agentID);
// FIXME MAYBE: We're not handling sortOrder! // FIXME MAYBE: We're not handling sortOrder!

8
OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescServerConnector.cs
View File

@ -35,13 +35,13 @@ using OpenMetaverse;
namespace OpenSim.Capabilities.Handlers namespace OpenSim.Capabilities.Handlers
{ {
public class WebFetchInvDescServerConnector : ServiceConnector public class FetchInvDescServerConnector : ServiceConnector
{ {
private IInventoryService m_InventoryService; private IInventoryService m_InventoryService;
private ILibraryService m_LibraryService; private ILibraryService m_LibraryService;
private string m_ConfigName = "CapsService"; private string m_ConfigName = "CapsService";
public WebFetchInvDescServerConnector(IConfigSource config, IHttpServer server, string configName) : public FetchInvDescServerConnector(IConfigSource config, IHttpServer server, string configName) :
base(config, server, configName) base(config, server, configName)
{ {
if (configName != String.Empty) if (configName != String.Empty)
@ -67,13 +67,13 @@ namespace OpenSim.Capabilities.Handlers
m_LibraryService = m_LibraryService =
ServerUtils.LoadPlugin<ILibraryService>(libService, args); ServerUtils.LoadPlugin<ILibraryService>(libService, args);
WebFetchInvDescHandler webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService); FetchInvDescHandler webFetchHandler = new FetchInvDescHandler(m_InventoryService, m_LibraryService);
IRequestHandler reqHandler IRequestHandler reqHandler
= new RestStreamHandler( = new RestStreamHandler(
"POST", "POST",
"/CAPS/WebFetchInvDesc/" /*+ UUID.Random()*/, "/CAPS/WebFetchInvDesc/" /*+ UUID.Random()*/,
webFetchHandler.FetchInventoryDescendentsRequest, webFetchHandler.FetchInventoryDescendentsRequest,
"WebFetchInvDesc", "FetchInvDescendents",
null); null);
server.AddStreamHandler(reqHandler); server.AddStreamHandler(reqHandler);
} }

4
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
View File

@ -94,7 +94,7 @@ namespace OpenSim.Region.ClientStack.Linden
private string m_fetchInventoryDescendents2Url; private string m_fetchInventoryDescendents2Url;
private string m_webFetchInventoryDescendentsUrl; private string m_webFetchInventoryDescendentsUrl;
private static WebFetchInvDescHandler m_webFetchHandler; private static FetchInvDescHandler m_webFetchHandler;
private static Thread[] m_workerThreads = null; private static Thread[] m_workerThreads = null;
@ -197,7 +197,7 @@ namespace OpenSim.Region.ClientStack.Linden
m_LibraryService = Scene.LibraryService; m_LibraryService = Scene.LibraryService;
// We'll reuse the same handler for all requests. // We'll reuse the same handler for all requests.
m_webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService); m_webFetchHandler = new FetchInvDescHandler(m_InventoryService, m_LibraryService);
Scene.EventManager.OnRegisterCaps += RegisterCaps; Scene.EventManager.OnRegisterCaps += RegisterCaps;