aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authordiva2009-03-26 22:17:57 +0000
committerdiva2009-03-26 22:17:57 +0000
commita423b3060b0149d5e5725307bf5edb7be88b238d (patch)
tree967c2640798fa1741e3f1bac95d516567a8d1a3d /OpenSim/Framework
parent* correct iar root folder location for saving of individual items (diff)
downloadopensim-SC-a423b3060b0149d5e5725307bf5edb7be88b238d.zip
opensim-SC-a423b3060b0149d5e5725307bf5edb7be88b238d.tar.gz
opensim-SC-a423b3060b0149d5e5725307bf5edb7be88b238d.tar.bz2
opensim-SC-a423b3060b0149d5e5725307bf5edb7be88b238d.tar.xz
Notecard updates bypassing the regions. (HGStandalone only)
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 8a4d145..db58975 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -112,6 +112,10 @@ namespace OpenSim.Framework.Communications.Capabilities
112 { 112 {
113 get { return m_httpListener.SSLCommonName; } 113 get { return m_httpListener.SSLCommonName; }
114 } 114 }
115 public CapsHandlers CapsHandlers
116 {
117 get { return m_capsHandlers; }
118 }
115 119
116 // These are callbacks which will be setup by the scene so that we can update scene data when we 120 // These are callbacks which will be setup by the scene so that we can update scene data when we
117 // receive capability calls 121 // receive capability calls
@@ -626,7 +630,9 @@ namespace OpenSim.Framework.Communications.Capabilities
626 public string NoteCardAgentInventory(string request, string path, string param, 630 public string NoteCardAgentInventory(string request, string path, string param,
627 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 631 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
628 { 632 {
629 m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName); 633 m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName + "\n" + request);
634 m_log.Debug("[CAPS]: NoteCardAgentInventory Request is: " + request);
635
630 //OpenMetaverse.StructuredData.OSDMap hash = (OpenMetaverse.StructuredData.OSDMap)OpenMetaverse.StructuredData.LLSDParser.DeserializeBinary(Utils.StringToBytes(request)); 636 //OpenMetaverse.StructuredData.OSDMap hash = (OpenMetaverse.StructuredData.OSDMap)OpenMetaverse.StructuredData.LLSDParser.DeserializeBinary(Utils.StringToBytes(request));
631 Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request)); 637 Hashtable hash = (Hashtable) LLSD.LLSDDeserialize(Utils.StringToBytes(request));
632 LLSDItemUpdate llsdRequest = new LLSDItemUpdate(); 638 LLSDItemUpdate llsdRequest = new LLSDItemUpdate();