diff options
author | Melanie | 2011-05-08 20:20:40 +0100 |
---|---|---|
committer | Melanie | 2011-05-08 20:20:40 +0100 |
commit | 1be67914fab348115faa1fc9e9ecffbf7c303093 (patch) | |
tree | 7ad4917efae6aebeefa51fe03b1d1aac3e95efcb /OpenSim/Capabilities | |
parent | Enable compressed (gzip) fatpack transfers. (diff) | |
parent | Mantis #5472 (diff) | |
download | opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.zip opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.gz opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.bz2 opensim-SC_OLD-1be67914fab348115faa1fc9e9ecffbf7c303093.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Capabilities/Caps.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Capabilities/Caps.cs b/OpenSim/Capabilities/Caps.cs index e188896..56ccfd6 100644 --- a/OpenSim/Capabilities/Caps.cs +++ b/OpenSim/Capabilities/Caps.cs | |||
@@ -50,8 +50,8 @@ namespace OpenSim.Framework.Capabilities | |||
50 | 50 | ||
51 | public class Caps | 51 | public class Caps |
52 | { | 52 | { |
53 | private static readonly ILog m_log = | 53 | // private static readonly ILog m_log = |
54 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | // LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
55 | 55 | ||
56 | private string m_httpListenerHostName; | 56 | private string m_httpListenerHostName; |
57 | private uint m_httpListenPort; | 57 | private uint m_httpListenPort; |