diff options
| author | Melanie | 2012-12-07 03:49:04 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-07 03:49:04 +0000 |
| commit | 2cb824d3fcd37b9f9c9a9981702b81643c531a1b (patch) | |
| tree | 8bfb77166642a49f142e60a3486a264e7635ef83 /OpenSim/Framework/Servers | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.zip opensim-SC_OLD-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.gz opensim-SC_OLD-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.bz2 opensim-SC_OLD-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Framework/Servers')
| -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 93043cb..eefcdad 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -437,7 +437,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 437 | // reqnum = String.Format("{0}:{1}",request.RemoteIPEndPoint,request.Headers["opensim-request-id"]); | 437 | // reqnum = String.Format("{0}:{1}",request.RemoteIPEndPoint,request.Headers["opensim-request-id"]); |
| 438 | //m_log.DebugFormat("[BASE HTTP SERVER]: <{0}> handle request for {1}",reqnum,request.RawUrl); | 438 | //m_log.DebugFormat("[BASE HTTP SERVER]: <{0}> handle request for {1}",reqnum,request.RawUrl); |
| 439 | 439 | ||
| 440 | Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US", true); | 440 | Culture.SetCurrentCulture(); |
| 441 | 441 | ||
| 442 | // // This is the REST agent interface. We require an agent to properly identify | 442 | // // This is the REST agent interface. We require an agent to properly identify |
| 443 | // // itself. If the REST handler recognizes the prefix it will attempt to | 443 | // // itself. If the REST handler recognizes the prefix it will attempt to |