diff options
author | Justin Clark-Casey (justincc) | 2010-09-21 01:01:07 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-09-21 01:01:07 +0100 |
commit | 192bcab98711245e241f1b37cb12cc29a26b168e (patch) | |
tree | 6e72ef2c0b7d20355f29119a603877786d83bf37 /OpenSim/Framework/Console/RemoteConsole.cs | |
parent | If the uuid of a SceneObjectGroup (RootPart) is changed before adding to the ... (diff) | |
parent | * Tweaked the LocationTests for maximum coverage. (diff) | |
download | opensim-SC_OLD-192bcab98711245e241f1b37cb12cc29a26b168e.zip opensim-SC_OLD-192bcab98711245e241f1b37cb12cc29a26b168e.tar.gz opensim-SC_OLD-192bcab98711245e241f1b37cb12cc29a26b168e.tar.bz2 opensim-SC_OLD-192bcab98711245e241f1b37cb12cc29a26b168e.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Console/RemoteConsole.cs')
-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 | } |