diff options
| author | Melanie | 2011-12-05 20:32:35 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-05 20:32:35 +0000 |
| commit | bc17e2e9cf1361116f9082326f7630b8f0c862ba (patch) | |
| tree | d0bc568f8b5eeb47ccd77c822e6941b0e150319c /OpenSim/Region/ClientStack | |
| parent | Add the proper result code as per the LL announcement for llTransferLindenDol... (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.zip opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.gz opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.bz2 opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.xz | |
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 98dda36..2347cf2 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
| @@ -223,7 +223,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 223 | /// <param name="httpResponse">HTTP response header object</param> | 223 | /// <param name="httpResponse">HTTP response header object</param> |
| 224 | /// <returns></returns> | 224 | /// <returns></returns> |
| 225 | public string SeedCapRequest(string request, string path, string param, | 225 | public string SeedCapRequest(string request, string path, string param, |
| 226 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 226 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 227 | { | 227 | { |
| 228 | // m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName); | 228 | // m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName); |
| 229 | 229 | ||
| @@ -256,7 +256,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 256 | /// <param name="httpResponse">HTTP response header object</param> | 256 | /// <param name="httpResponse">HTTP response header object</param> |
| 257 | /// <returns></returns> | 257 | /// <returns></returns> |
| 258 | public string ScriptTaskInventory(string request, string path, string param, | 258 | public string ScriptTaskInventory(string request, string path, string param, |
| 259 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 259 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 260 | { | 260 | { |
| 261 | try | 261 | try |
| 262 | { | 262 | { |
| @@ -685,7 +685,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 685 | /// <param name="param"></param> | 685 | /// <param name="param"></param> |
| 686 | /// <returns></returns> | 686 | /// <returns></returns> |
| 687 | public string NoteCardAgentInventory(string request, string path, string param, | 687 | public string NoteCardAgentInventory(string request, string path, string param, |
| 688 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 688 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 689 | { | 689 | { |
| 690 | //m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName + "\n" + request); | 690 | //m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName + "\n" + request); |
| 691 | //m_log.Debug("[CAPS]: NoteCardAgentInventory Request is: " + request); | 691 | //m_log.Debug("[CAPS]: NoteCardAgentInventory Request is: " + request); |