ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 22:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

put back updated FetchLib2 cap. Still no viewer uses it, disabled

Browse Source
This commit is contained in:
UbitUmarov
2022-04-22 16:16:04 +01:00
parent 7a10cd9959
commit 71f856bfa8
3 changed files with 160 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
OpenSim/Region/ClientStack/Linden/Caps/FetchInventory2Module.cs
View File

@@ -49,14 +49,18 @@ namespace OpenSim.Region.ClientStack.Linden
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public bool Enabled { get; private set; }
private bool m_enabledLib;
private int m_nScenes;
private IInventoryService m_inventoryService = null;
private ILibraryService m_LibraryService = null;
private string m_fetchInventory2Url;
private ExpiringKey<UUID> m_badRequests;
private string m_fetchLib2Url;
#region ISharedRegionModule Members
public void Initialise(IConfigSource source)
@@ -66,9 +70,12 @@ namespace OpenSim.Region.ClientStack.Linden
return;
m_fetchInventory2Url = config.GetString("Cap_FetchInventory2", string.Empty);
m_fetchLib2Url = config.GetString("Cap_FetchLib2", "localhost");
if (m_fetchInventory2Url != string.Empty)
Enabled = true;
if (m_fetchInventory2Url != string.Empty)
m_enabledLib = true;
}
public void AddRegion(Scene s)
@@ -127,6 +134,14 @@ namespace OpenSim.Region.ClientStack.Linden
private void RegisterCaps(UUID agentID, Caps caps)
{
if (m_fetchInventory2Url == "localhost")
RegisterFetchCap(agentID, caps, m_fetchInventory2Url);
if(m_enabledLib)
RegisterFetchLibCap(agentID, caps, "FetchLib2", m_fetchLib2Url);
}
private void RegisterFetchCap(UUID agentID, Caps caps, string url)
{
if (url == "localhost")
{
FetchInventory2Handler fetchHandler = new FetchInventory2Handler(m_inventoryService, agentID);
caps.RegisterSimpleHandler("FetchInventory2",
@@ -138,12 +153,33 @@ namespace OpenSim.Region.ClientStack.Linden
}
else
{
caps.RegisterHandler("FetchInventory2", m_fetchInventory2Url);
caps.RegisterHandler("FetchInventory2", url);
}
// m_log.DebugFormat(
// "[FETCH INVENTORY2 MODULE]: Registered capability {0} at {1} in region {2} for {3}",
// capName, capUrl, m_scene.RegionInfo.RegionName, agentID);
//m_log.DebugFormat(
// "[FETCH INVENTORY2 MODULE]: Registered capability FetchInventory2 at {0} in region {1} for {2}",
// capUrl, m_scene.RegionInfo.RegionName, agentID);
}
private void RegisterFetchLibCap(UUID agentID, Caps caps, string capName, string url)
{
if (url == "localhost")
{
FetchLib2Handler fetchHandler = new FetchLib2Handler(m_inventoryService, m_LibraryService, agentID);
caps.RegisterSimpleHandler("FetchLib2",
new SimpleOSDMapHandler("POST", "/" + UUID.Random(), delegate (IOSHttpRequest httpRequest, IOSHttpResponse httpResponse, OSDMap map)
{
fetchHandler.FetchLibSimpleRequest(httpRequest, httpResponse, map, m_badRequests);
}
));
}
else
{
caps.RegisterHandler("FetchLib2", url);
}
//m_log.DebugFormat(
// "[FETCH INVENTORY2 MODULE]: Registered capability FetchLib2 at {0} in region {1} for {2}",
// capUrl, m_scene.RegionInfo.RegionName, agentID);
}
}
}