aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-20 22:11:53 +0000
committerMelanie Thielker2008-09-20 22:11:53 +0000
commita8785f5b2cd27344897baf06ec8ec0fe34c4f370 (patch)
tree7c17524c693b526a1c4078740c4af0238a8bf996
parentRemove CAPS notecard updating, as LL isn't supporting it and the viewer (diff)
downloadopensim-SC-a8785f5b2cd27344897baf06ec8ec0fe34c4f370.zip
opensim-SC-a8785f5b2cd27344897baf06ec8ec0fe34c4f370.tar.gz
opensim-SC-a8785f5b2cd27344897baf06ec8ec0fe34c4f370.tar.bz2
opensim-SC-a8785f5b2cd27344897baf06ec8ec0fe34c4f370.tar.xz
And re-reverse the names from last commit
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index e058555..d42c055 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -168,10 +168,10 @@ namespace OpenSim.Framework.Communications.Capabilities
168 m_capsHandlers["UpdateNotecardAgentInventory"] = 168 m_capsHandlers["UpdateNotecardAgentInventory"] =
169 new RestStreamHandler("POST", capsBase + m_notecardUpdatePath, NoteCardAgentInventory); 169 new RestStreamHandler("POST", capsBase + m_notecardUpdatePath, NoteCardAgentInventory);
170 m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"]; 170 m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"];
171 m_capsHandlers["UpdateNotecardTaskInventory"] = 171 m_capsHandlers["UpdateScriptTaskInventory"] =
172 new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory); 172 new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory);
173 // LL doesn't offer this 173 // LL doesn't offer this
174 // m_capsHandlers["UpdateScriptTaskInventory"] = m_capsHandlers["UpdateNotecardTaskInventory"]; 174 // m_capsHandlers["UpdateNotecardTaskInventory"] = m_capsHandlers["UpdateScriptTaskInventory"];
175 175
176 // justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and 176 // justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and
177 // subsequent inventory breakage, in the edit object pane (such as mantis 1085). This requires 177 // subsequent inventory breakage, in the edit object pane (such as mantis 1085). This requires