aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 858ff1d..5809455 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -203,8 +203,7 @@ namespace OpenSim.Framework.Communications.Capabilities
203 m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"]; 203 m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"];
204 m_capsHandlers["UpdateScriptAgent"] = m_capsHandlers["UpdateScriptAgentInventory"]; 204 m_capsHandlers["UpdateScriptAgent"] = m_capsHandlers["UpdateScriptAgentInventory"];
205 205
206 // rob smart 206 // As of RC 1.22.9 of the Linden client this is supported
207 // adding handling for WebFetchInventoryDescendents which appears in RC 1.22.9
208 m_capsHandlers["WebFetchInventoryDescendents"] =new RestStreamHandler("POST", capsBase + m_fetchInventoryPath, FetchInventoryDescendentsRequest); 207 m_capsHandlers["WebFetchInventoryDescendents"] =new RestStreamHandler("POST", capsBase + m_fetchInventoryPath, FetchInventoryDescendentsRequest);
209 208
210 // justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and 209 // justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and
@@ -471,7 +470,7 @@ namespace OpenSim.Framework.Communications.Capabilities
471 contents.items.Array.Add(ConvertInventoryItem(invItem)); 470 contents.items.Array.Add(ConvertInventoryItem(invItem));
472 } 471 }
473 } 472 }
474 /* Rob Smart The following block i removed as it ALWAYS sends the error to the client because the RC 1.22.9 client tries to 473 /* The following block is removed as it ALWAYS sends the error to the client because the RC 1.22.9 client tries to
475 find items that have become dissasociated with a paret folder and have parent of 00000000-0000-00000.... 474 find items that have become dissasociated with a paret folder and have parent of 00000000-0000-00000....
476 else 475 else
477 { 476 {