diff options
| author | Melanie | 2010-09-21 04:03:14 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-21 04:03:14 +0100 |
| commit | 9feef34a8144ee7661f8c6207a2a2e432c58eccf (patch) | |
| tree | 7e04dfd88a6d02ff7fd2b2e45bf0d92d8db90ec8 /OpenSim/Framework/Console | |
| parent | Overwrite the core version of the string parsing method with ours (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-9feef34a8144ee7661f8c6207a2a2e432c58eccf.zip opensim-SC-9feef34a8144ee7661f8c6207a2a2e432c58eccf.tar.gz opensim-SC-9feef34a8144ee7661f8c6207a2a2e432c58eccf.tar.bz2 opensim-SC-9feef34a8144ee7661f8c6207a2a2e432c58eccf.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Console/RemoteConsole.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs index c038aac..7eb289b 100644 --- a/OpenSim/Framework/Console/RemoteConsole.cs +++ b/OpenSim/Framework/Console/RemoteConsole.cs | |||
| @@ -288,7 +288,7 @@ namespace OpenSim.Framework.Console | |||
| 288 | 288 | ||
| 289 | reply["str_response_string"] = xmldoc.InnerXml; | 289 | reply["str_response_string"] = xmldoc.InnerXml; |
| 290 | reply["int_response_code"] = 200; | 290 | reply["int_response_code"] = 200; |
| 291 | reply["content_type"] = "text/plain"; | 291 | reply["content_type"] = "text/xml"; |
| 292 | 292 | ||
| 293 | return reply; | 293 | return reply; |
| 294 | } | 294 | } |
| @@ -343,7 +343,7 @@ namespace OpenSim.Framework.Console | |||
| 343 | 343 | ||
| 344 | reply["str_response_string"] = xmldoc.InnerXml; | 344 | reply["str_response_string"] = xmldoc.InnerXml; |
| 345 | reply["int_response_code"] = 200; | 345 | reply["int_response_code"] = 200; |
| 346 | reply["content_type"] = "text/plain"; | 346 | reply["content_type"] = "text/xml"; |
| 347 | 347 | ||
| 348 | return reply; | 348 | return reply; |
| 349 | } | 349 | } |