diff options
| author | Melanie | 2012-06-15 02:52:56 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-15 02:52:56 +0100 |
| commit | ca4e6d9b5b408d31d5778578cf41d1c77198287f (patch) | |
| tree | 2348d8a79ce819e3adbdf54fd0458a4d0ed7091d /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix a regression in BaseHttpServer.HandleXmlRpcRequests() from recent c6e3752 (diff) | |
| download | opensim-SC_OLD-ca4e6d9b5b408d31d5778578cf41d1c77198287f.zip opensim-SC_OLD-ca4e6d9b5b408d31d5778578cf41d1c77198287f.tar.gz opensim-SC_OLD-ca4e6d9b5b408d31d5778578cf41d1c77198287f.tar.bz2 opensim-SC_OLD-ca4e6d9b5b408d31d5778578cf41d1c77198287f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 9cc1d4c..31af44c 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -786,7 +786,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 786 | requestStream.Close(); | 786 | requestStream.Close(); |
| 787 | //m_log.Debug(requestBody); | 787 | //m_log.Debug(requestBody); |
| 788 | requestBody = requestBody.Replace("<base64></base64>", ""); | 788 | requestBody = requestBody.Replace("<base64></base64>", ""); |
| 789 | string responseString = null; | 789 | string responseString = String.Empty; |
| 790 | XmlRpcRequest xmlRprcRequest = null; | 790 | XmlRpcRequest xmlRprcRequest = null; |
| 791 | 791 | ||
| 792 | try | 792 | try |