diff options
| author | Melanie | 2009-12-10 18:17:29 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-10 18:17:29 +0000 |
| commit | 59ca92b10b31c589312cb74e7554adf817bad466 (patch) | |
| tree | 5630cc3b75d6ecf4bf0b5c4ad200f9997ea72a8b /OpenSim/Region/CoreModules | |
| parent | Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into c... (diff) | |
| parent | Correct AbsolutePosition calculation (diff) | |
| download | opensim-SC_OLD-59ca92b10b31c589312cb74e7554adf817bad466.zip opensim-SC_OLD-59ca92b10b31c589312cb74e7554adf817bad466.tar.gz opensim-SC_OLD-59ca92b10b31c589312cb74e7554adf817bad466.tar.bz2 opensim-SC_OLD-59ca92b10b31c589312cb74e7554adf817bad466.tar.xz | |
Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs index 710e3ca..39e2413 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs | |||
| @@ -331,12 +331,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion | |||
| 331 | { | 331 | { |
| 332 | //m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called"); | 332 | //m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called"); |
| 333 | 333 | ||
| 334 | m_log.Debug("---------------------------"); | 334 | /* m_log.Debug("---------------------------"); |
| 335 | m_log.Debug(" >> uri=" + request["uri"]); | 335 | m_log.Debug(" >> uri=" + request["uri"]); |
| 336 | m_log.Debug(" >> content-type=" + request["content-type"]); | 336 | m_log.Debug(" >> content-type=" + request["content-type"]); |
| 337 | m_log.Debug(" >> http-method=" + request["http-method"]); | 337 | m_log.Debug(" >> http-method=" + request["http-method"]); |
| 338 | m_log.Debug("---------------------------\n"); | 338 | m_log.Debug("---------------------------\n"); */ |
| 339 | |||
| 340 | Hashtable responsedata = new Hashtable(); | 339 | Hashtable responsedata = new Hashtable(); |
| 341 | responsedata["content_type"] = "text/html"; | 340 | responsedata["content_type"] = "text/html"; |
| 342 | responsedata["keepalive"] = false; | 341 | responsedata["keepalive"] = false; |
| @@ -576,11 +575,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion | |||
| 576 | { | 575 | { |
| 577 | m_log.Debug("[CONNECTION DEBUGGING]: ObjectHandler Called"); | 576 | m_log.Debug("[CONNECTION DEBUGGING]: ObjectHandler Called"); |
| 578 | 577 | ||
| 579 | m_log.Debug("---------------------------"); | 578 | /* m_log.Debug("---------------------------"); |
| 580 | m_log.Debug(" >> uri=" + request["uri"]); | 579 | m_log.Debug(" >> uri=" + request["uri"]); |
| 581 | m_log.Debug(" >> content-type=" + request["content-type"]); | 580 | m_log.Debug(" >> content-type=" + request["content-type"]); |
| 582 | m_log.Debug(" >> http-method=" + request["http-method"]); | 581 | m_log.Debug(" >> http-method=" + request["http-method"]); |
| 583 | m_log.Debug("---------------------------\n"); | 582 | m_log.Debug("---------------------------\n"); */ |
| 584 | 583 | ||
| 585 | Hashtable responsedata = new Hashtable(); | 584 | Hashtable responsedata = new Hashtable(); |
| 586 | responsedata["content_type"] = "text/html"; | 585 | responsedata["content_type"] = "text/html"; |