aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-20 22:04:59 +0000
committerMelanie Thielker2008-09-20 22:04:59 +0000
commite4bead4edc50c669fc291a8235e6f6850ade9d8f (patch)
treeae3678eacd13d1e1c60cf18223529ac9dd490d29 /OpenSim/Framework
parentPartially implement notecard saves in task inventory. Still makes the (diff)
downloadopensim-SC_OLD-e4bead4edc50c669fc291a8235e6f6850ade9d8f.zip
opensim-SC_OLD-e4bead4edc50c669fc291a8235e6f6850ade9d8f.tar.gz
opensim-SC_OLD-e4bead4edc50c669fc291a8235e6f6850ade9d8f.tar.bz2
opensim-SC_OLD-e4bead4edc50c669fc291a8235e6f6850ade9d8f.tar.xz
Remove CAPS notecard updating, as LL isn't supporting it and the viewer
is not playing nice
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index a891517..e058555 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -170,7 +170,8 @@ namespace OpenSim.Framework.Communications.Capabilities
170 m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"]; 170 m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"];
171 m_capsHandlers["UpdateNotecardTaskInventory"] = 171 m_capsHandlers["UpdateNotecardTaskInventory"] =
172 new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory); 172 new RestStreamHandler("POST", capsBase + m_notecardTaskUpdatePath, ScriptTaskInventory);
173 m_capsHandlers["UpdateScriptTaskInventory"] = m_capsHandlers["UpdateNotecardTaskInventory"]; 173 // LL doesn't offer this
174 // m_capsHandlers["UpdateScriptTaskInventory"] = m_capsHandlers["UpdateNotecardTaskInventory"];
174 175
175 // 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
176 // 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