aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-21 00:05:33 +0000
committerMelanie Thielker2008-09-21 00:05:33 +0000
commit70be30fbaa6f41ae3849eb33fb23aebdeb02e3b8 (patch)
treea2ef0880cfec743a4b935bac579f2345886685b6 /OpenSim/Framework
parentEXPERIMENTAL: Early commit of new Script Engine Component System (diff)
downloadopensim-SC-70be30fbaa6f41ae3849eb33fb23aebdeb02e3b8.zip
opensim-SC-70be30fbaa6f41ae3849eb33fb23aebdeb02e3b8.tar.gz
opensim-SC-70be30fbaa6f41ae3849eb33fb23aebdeb02e3b8.tar.bz2
opensim-SC-70be30fbaa6f41ae3849eb33fb23aebdeb02e3b8.tar.xz
Completely revert the notecard uploading changes I made, since they
appear to break script saves in prims for some.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index d42c055..a0c59ad 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -170,8 +170,6 @@ namespace OpenSim.Framework.Communications.Capabilities
170 m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"]; 170 m_capsHandlers["UpdateScriptAgentInventory"] = m_capsHandlers["UpdateNotecardAgentInventory"];
171 m_capsHandlers["UpdateScriptTaskInventory"] = 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
174 // m_capsHandlers["UpdateNotecardTaskInventory"] = m_capsHandlers["UpdateScriptTaskInventory"];
175 173
176 // justincc: I've disabled the CAPS service for now to fix problems with selecting textures, and 174 // 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 175 // subsequent inventory breakage, in the edit object pane (such as mantis 1085). This requires