diff options
| author | Robert Adams | 2013-11-15 14:56:13 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-11-15 14:56:13 -0800 |
| commit | 604b39cea908029c80aa8ee5ff3aee5c8000c0e4 (patch) | |
| tree | bea875d6651531a030630e161b658c74d3aaf357 /OpenSim/Framework/Servers/HttpServer | |
| parent | Merge branch 'master' into varregion (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.zip opensim-SC_OLD-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.gz opensim-SC_OLD-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.bz2 opensim-SC_OLD-604b39cea908029c80aa8ee5ff3aee5c8000c0e4.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer')
| -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 76b4257..e1ae74e 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -785,7 +785,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 785 | "[BASE HTTP SERVER]: HTTP IN {0} :{1} {2} content type handler {3} {4} from {5}", | 785 | "[BASE HTTP SERVER]: HTTP IN {0} :{1} {2} content type handler {3} {4} from {5}", |
| 786 | RequestNumber, | 786 | RequestNumber, |
| 787 | Port, | 787 | Port, |
| 788 | (request.ContentType == null || request.ContentType == "") ? "not set" : request.ContentType, | 788 | string.IsNullOrEmpty(request.ContentType) ? "not set" : request.ContentType, |
| 789 | request.HttpMethod, | 789 | request.HttpMethod, |
| 790 | request.Url.PathAndQuery, | 790 | request.Url.PathAndQuery, |
| 791 | request.RemoteIPEndPoint); | 791 | request.RemoteIPEndPoint); |