aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Capabilities
diff options
context:
space:
mode:
authorJeff Ames2008-05-25 23:27:38 +0000
committerJeff Ames2008-05-25 23:27:38 +0000
commit5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d (patch)
treeb010c015ac515fe2a3dd0c9f89c16cbc6383d685 /OpenSim/Framework/Communications/Capabilities
parent* A hacky Top Scripts display. It isn't accurate as far as ms accounting, ho... (diff)
downloadopensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.zip
opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.gz
opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.bz2
opensim-SC_OLD-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.xz
Update svn properties. Formatting cleanup.
Diffstat (limited to 'OpenSim/Framework/Communications/Capabilities')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs6
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs2
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 8d8f945..c2b0046 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -211,7 +211,7 @@ namespace OpenSim.Framework.Communications.Capabilities
211 /// <param name="httpRequest">HTTP request header object</param> 211 /// <param name="httpRequest">HTTP request header object</param>
212 /// <param name="httpResponse">HTTP response header object</param> 212 /// <param name="httpResponse">HTTP response header object</param>
213 /// <returns></returns> 213 /// <returns></returns>
214 public string CapsRequest(string request, string path, string param, 214 public string CapsRequest(string request, string path, string param,
215 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 215 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
216 { 216 {
217 m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName); 217 m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName);
@@ -509,7 +509,7 @@ namespace OpenSim.Framework.Communications.Capabilities
509 /// <param name="httpRequest">HTTP request header object</param> 509 /// <param name="httpRequest">HTTP request header object</param>
510 /// <param name="httpResponse">HTTP response header object</param> 510 /// <param name="httpResponse">HTTP response header object</param>
511 /// <returns></returns> 511 /// <returns></returns>
512 public string ScriptTaskInventory(string request, string path, string param, 512 public string ScriptTaskInventory(string request, string path, string param,
513 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 513 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
514 { 514 {
515 try 515 try
@@ -564,7 +564,7 @@ namespace OpenSim.Framework.Communications.Capabilities
564 /// <param name="path"></param> 564 /// <param name="path"></param>
565 /// <param name="param"></param> 565 /// <param name="param"></param>
566 /// <returns></returns> 566 /// <returns></returns>
567 public string NoteCardAgentInventory(string request, string path, string param, 567 public string NoteCardAgentInventory(string request, string path, string param,
568 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 568 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
569 { 569 {
570 m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName); 570 m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName);
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
index c5cb268..36090e1 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Framework.Communications.Capabilities
44 m_method = method; 44 m_method = method;
45 } 45 }
46 46
47 public override byte[] Handle(string path, Stream request, 47 public override byte[] Handle(string path, Stream request,
48 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 48 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
49 { 49 {
50 //Encoding encoding = Encoding.UTF8; 50 //Encoding encoding = Encoding.UTF8;