diff options
| author | Diva Canto | 2010-12-10 11:33:09 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-12-10 11:33:09 -0800 |
| commit | 58b251506cd79e1abe5d48e4f5be0df66e7e7413 (patch) | |
| tree | e45b9133dac91049873bc049537a60719b5d197e /OpenSim/Framework/Servers | |
| parent | A stab at mantis #5256. Separate ScenePresence updates from SceneObject updat... (diff) | |
| parent | Adjust hypergrid console commands to latest changes. (diff) | |
| download | opensim-SC_OLD-58b251506cd79e1abe5d48e4f5be0df66e7e7413.zip opensim-SC_OLD-58b251506cd79e1abe5d48e4f5be0df66e7e7413.tar.gz opensim-SC_OLD-58b251506cd79e1abe5d48e4f5be0df66e7e7413.tar.bz2 opensim-SC_OLD-58b251506cd79e1abe5d48e4f5be0df66e7e7413.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -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 3c58a7d..3343f60 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
| @@ -1845,7 +1845,7 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
| 1845 | /// property in StartHttp() for the HttpListener | 1845 | /// property in StartHttp() for the HttpListener |
| 1846 | public class HttpServerLogWriter : ILogWriter | 1846 | public class HttpServerLogWriter : ILogWriter |
| 1847 | { | 1847 | { |
| 1848 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 1848 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 1849 | 1849 | ||
| 1850 | public void Write(object source, LogPrio priority, string message) | 1850 | public void Write(object source, LogPrio priority, string message) |
| 1851 | { | 1851 | { |