diff --git a/OpenSim/Capabilities/Caps.cs b/OpenSim/Capabilities/Caps.cs index 1ebc6b44c5..279bbcbfe9 100644 --- a/OpenSim/Capabilities/Caps.cs +++ b/OpenSim/Capabilities/Caps.cs @@ -313,30 +313,6 @@ namespace OpenSim.Framework.Capabilities return caps; } - public Hashtable GetCapsDetails2(bool excludeSeed, HashSet requestedCaps) - { - Hashtable caps = CapsHandlers.GetCapsDetails2(excludeSeed, requestedCaps); - - lock (m_pollServiceHandlers) - { - foreach (KeyValuePair kvp in m_pollServiceHandlers) - { - if (!requestedCaps.Contains(kvp.Key)) - continue; - caps[kvp.Key] = m_baseCapsURL + kvp.Value.Url; - } - } - - // Add the external too - foreach (KeyValuePair kvp in ExternalCapsHandlers) - { - if (requestedCaps.Contains(kvp.Key)) - caps[kvp.Key] = kvp.Value; - } - - return caps; - } - public void GetCapsDetailsLLSDxml(HashSet requestedCaps, osUTF8 sb) { diff --git a/OpenSim/Capabilities/CapsHandlers.cs b/OpenSim/Capabilities/CapsHandlers.cs index 398e9115db..c63fee2ae3 100644 --- a/OpenSim/Capabilities/CapsHandlers.cs +++ b/OpenSim/Capabilities/CapsHandlers.cs @@ -208,38 +208,6 @@ namespace OpenSim.Framework.Capabilities return caps; } - public Hashtable GetCapsDetails2(bool excludeSeed, HashSet requestedCaps) - { - Hashtable caps = new Hashtable(); - if (requestedCaps is null) - { - lock (m_capsHandlers) - { - foreach (KeyValuePair kvp in m_capsSimpleHandlers) - caps[kvp.Key] = m_baseURL + kvp.Value.Path; - foreach (KeyValuePair kvp in m_capsHandlers) - caps[kvp.Key] = m_baseURL + kvp.Value.Path; - } - return caps; - } - - lock (m_capsHandlers) - { - foreach(string capsName in requestedCaps) - { - if (excludeSeed && "SEED".Equals(capsName)) - continue; - - if (m_capsSimpleHandlers.TryGetValue(capsName, out ISimpleStreamHandler shdr)) - caps[capsName] = m_baseURL + shdr.Path; - else if (m_capsHandlers.TryGetValue(capsName, out IRequestHandler chdr)) - caps[capsName] = m_baseURL + chdr.Path; - } - } - - return caps; - } - public void GetCapsDetailsLLSDxml(HashSet requestedCaps, osUTF8 sb) { lock (m_capsHandlers)