* Revert caps fetch inventory service back to UDP for now
* Linden client 1.19.1.4 appears to be happy using UDP for this request again, and Linden's own servers (1.21) don't appear to be supplying the CAPS version currently * This should for now fix the bug where texture selection in the edit window both shows only already open textures, and later stops subsequent inventory requests from working.0.6.0-stable
parent
3f345bf685
commit
57fea65c82
|
@ -148,8 +148,20 @@ namespace OpenSim.Framework.Communications.Capabilities
|
||||||
m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"];
|
m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"];
|
||||||
m_capsHandlers["UpdateScriptTaskInventory"] =
|
m_capsHandlers["UpdateScriptTaskInventory"] =
|
||||||
new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory);
|
new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory);
|
||||||
m_capsHandlers["FetchInventoryDescendents"] =
|
|
||||||
new RestStreamHandler("POST", capsBase + m_fetchInventoryPath, FetchInventoryRequest);
|
// justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and
|
||||||
|
// subsequent inventory breakage, in the edit object pane (such as mantis 1085). This requires
|
||||||
|
// enhancements (probably filling out the folder part of the LLSD reply) to our CAPS service,
|
||||||
|
// but when I went on the Linden grid, the
|
||||||
|
// simulators I visited (version 1.21) were, surprisingly, no longer supplying this capability. Instead,
|
||||||
|
// the 1.19.1.4 client appeared to be happily flowing inventory data over UDP
|
||||||
|
//
|
||||||
|
// This is very probably just a temporary measure - once the CAPS service appears again on the Linden grid
|
||||||
|
// we will be
|
||||||
|
// able to get the data we need to implement the necessary part of the protocol to fix the issue above.
|
||||||
|
// m_capsHandlers["FetchInventoryDescendents"] =
|
||||||
|
// new RestStreamHandler("POST", capsBase + m_fetchInventoryPath, FetchInventoryRequest);
|
||||||
|
|
||||||
// m_capsHandlers["FetchInventoryDescendents"] =
|
// m_capsHandlers["FetchInventoryDescendents"] =
|
||||||
// new LLSDStreamhandler<LLSDFetchInventoryDescendents, LLSDInventoryDescendents>("POST",
|
// new LLSDStreamhandler<LLSDFetchInventoryDescendents, LLSDInventoryDescendents>("POST",
|
||||||
// capsBase + m_fetchInventory,
|
// capsBase + m_fetchInventory,
|
||||||
|
|
Loading…
Reference in New Issue