ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

add back cap FetchLib2 and add cap FetchLibDescendents2. Still disabled, Most viewers do not support them. Alchemy is working on it

Browse Source
This commit is contained in:
UbitUmarov
2022-04-22 19:49:16 +01:00
parent 71f856bfa8
commit 0138a43d3c
3 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,6 @@ namespace OpenSim.Region.ClientStack.Linden
private ExpiringKey<UUID> m_badRequests;
private string m_fetchInventoryDescendents2Url;
// private string m_webFetchInventoryDescendentsUrl;
private static FetchInvDescHandler m_webFetchHandler;
@@ -118,13 +117,7 @@ namespace OpenSim.Region.ClientStack.Linden
return;
m_fetchInventoryDescendents2Url = config.GetString("Cap_FetchInventoryDescendents2", string.Empty);
// m_webFetchInventoryDescendentsUrl = config.GetString("Cap_WebFetchInventoryDescendents", string.Empty);
// if (m_fetchInventoryDescendents2Url != string.Empty || m_webFetchInventoryDescendentsUrl != string.Empty)
if (m_fetchInventoryDescendents2Url != string.Empty)
{
m_Enabled = true;
}
m_Enabled = m_fetchInventoryDescendents2Url.Length > 0;
}
public void AddRegion(Scene s)
@@ -222,7 +215,7 @@ namespace OpenSim.Region.ClientStack.Linden
m_badRequests = null;
}
}
// m_queue.Dispose();
//m_queue.Dispose();
}
public string Name { get { return "WebFetchInvDescModule"; } }
@@ -346,38 +339,23 @@ namespace OpenSim.Region.ClientStack.Linden
private void RegisterCaps(UUID agentID, Caps caps)
{
RegisterFetchDescendentsCap(agentID, caps, "FetchInventoryDescendents2", m_fetchInventoryDescendents2Url);
}
private void RegisterFetchDescendentsCap(UUID agentID, Caps caps, string capName, string url)
{
string capUrl;
// disable the cap clause
if (url.Length == 0)
{
return;
}
// handled by the simulator
else if (url == "localhost")
if (m_fetchInventoryDescendents2Url == "localhost")
{
capUrl = "/" + UUID.Random();
// Register this as a poll service
PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(this, capUrl, agentID);
PollServiceInventoryEventArgs args = new PollServiceInventoryEventArgs(this, "/" + UUID.Random(), agentID);
//args.Type = PollServiceEventArgs.EventType.Inventory;
caps.RegisterPollHandler(capName, args);
caps.RegisterPollHandler("FetchInventoryDescendents2", args);
}
// external handler
else
{
capUrl = url;
IExternalCapsModule handler = Scene.RequestModuleInterface<IExternalCapsModule>();
if (handler != null)
handler.RegisterExternalUserCapsHandler(agentID,caps,capName,capUrl);
handler.RegisterExternalUserCapsHandler(agentID, caps, "FetchInventoryDescendents2", m_fetchInventoryDescendents2Url);
else
caps.RegisterHandler(capName, capUrl);
caps.RegisterHandler("FetchInventoryDescendents2", m_fetchInventoryDescendents2Url);
}
}