aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-09 21:50:22 +0000
committerJustin Clarke Casey2008-05-09 21:50:22 +0000
commit57fea65c825d69dfecd6c9ad9bc08fc87ddde84f (patch)
tree88237da7f85d8c33edd422f3acd91f4f0436f420 /OpenSim/Framework/Communications
parent* Removing polling delay for non-CAPS inventory fetch if the client has not y... (diff)
downloadopensim-SC_OLD-57fea65c825d69dfecd6c9ad9bc08fc87ddde84f.zip
opensim-SC_OLD-57fea65c825d69dfecd6c9ad9bc08fc87ddde84f.tar.gz
opensim-SC_OLD-57fea65c825d69dfecd6c9ad9bc08fc87ddde84f.tar.bz2
opensim-SC_OLD-57fea65c825d69dfecd6c9ad9bc08fc87ddde84f.tar.xz
* 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.
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs16
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,