diff options
Diffstat (limited to 'OpenSim/Framework/Communications')
| -rw-r--r-- | OpenSim/Framework/Communications/Capabilities/Caps.cs | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index d794db3..399b3b9 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
| @@ -148,8 +148,20 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
| 148 | m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"]; | 148 | m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"]; |
| 149 | m_capsHandlers["UpdateScriptTaskInventory"] = | 149 | m_capsHandlers["UpdateScriptTaskInventory"] = |
| 150 | new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory); | 150 | new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory); |
| 151 | m_capsHandlers["FetchInventoryDescendents"] = | 151 | |
| 152 | new RestStreamHandler("POST", capsBase + m_fetchInventoryPath, FetchInventoryRequest); | 152 | // justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and |
| 153 | // subsequent inventory breakage, in the edit object pane (such as mantis 1085). This requires | ||
| 154 | // enhancements (probably filling out the folder part of the LLSD reply) to our CAPS service, | ||
| 155 | // but when I went on the Linden grid, the | ||
| 156 | // simulators I visited (version 1.21) were, surprisingly, no longer supplying this capability. Instead, | ||
| 157 | // the 1.19.1.4 client appeared to be happily flowing inventory data over UDP | ||
| 158 | // | ||
| 159 | // This is very probably just a temporary measure - once the CAPS service appears again on the Linden grid | ||
| 160 | // we will be | ||
| 161 | // able to get the data we need to implement the necessary part of the protocol to fix the issue above. | ||
| 162 | // m_capsHandlers["FetchInventoryDescendents"] = | ||
| 163 | // new RestStreamHandler("POST", capsBase + m_fetchInventoryPath, FetchInventoryRequest); | ||
| 164 | |||
| 153 | // m_capsHandlers["FetchInventoryDescendents"] = | 165 | // m_capsHandlers["FetchInventoryDescendents"] = |
| 154 | // new LLSDStreamhandler<LLSDFetchInventoryDescendents, LLSDInventoryDescendents>("POST", | 166 | // new LLSDStreamhandler<LLSDFetchInventoryDescendents, LLSDInventoryDescendents>("POST", |
| 155 | // capsBase + m_fetchInventory, | 167 | // capsBase + m_fetchInventory, |