diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-15 13:10:21 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-15 13:10:21 -0400 |
| commit | 30ce56e7219b3d2ed16acb322cecec781c3776c5 (patch) | |
| tree | 3ab732fc9c8775a3fab0a705b4496ea21c1ab128 /OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |
| parent | * part one of adding physics combining (diff) | |
| parent | * whoops, missing a / (diff) | |
| download | opensim-SC_OLD-30ce56e7219b3d2ed16acb322cecec781c3776c5.zip opensim-SC_OLD-30ce56e7219b3d2ed16acb322cecec781c3776c5.tar.gz opensim-SC_OLD-30ce56e7219b3d2ed16acb322cecec781c3776c5.tar.bz2 opensim-SC_OLD-30ce56e7219b3d2ed16acb322cecec781c3776c5.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index c74eab1..75c9310 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -964,8 +964,10 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 964 | } | 964 | } |
| 965 | } | 965 | } |
| 966 | 966 | ||
| 967 | response.ContentType = "application/llsd+json"; | 967 | // response.ContentType = "application/llsd+json"; |
| 968 | return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(llsdResponse)); | 968 | // return Encoding.UTF8.GetBytes(OSDParser.SerializeJsonString(llsdResponse)); |
| 969 | response.ContentType = "application/llsd+xml"; | ||
| 970 | return OSDParser.SerializeLLSDXmlBytes(llsdResponse); | ||
| 969 | } | 971 | } |
| 970 | 972 | ||
| 971 | /// <summary> | 973 | /// <summary> |