diff options
author | CasperW | 2009-12-21 13:29:48 +0100 |
---|---|---|
committer | CasperW | 2009-12-21 13:29:48 +0100 |
commit | d8d6e8a30415197eb55c59172abfb890ec7a46bd (patch) | |
tree | db937d6c6e3816932781e7be90c318408d117a78 /OpenSim/Tests/Clients | |
parent | Fixed a nasty crash in StandUp() that occurred when the part got killed with ... (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-d8d6e8a30415197eb55c59172abfb890ec7a46bd.zip opensim-SC_OLD-d8d6e8a30415197eb55c59172abfb890ec7a46bd.tar.gz opensim-SC_OLD-d8d6e8a30415197eb55c59172abfb890ec7a46bd.tar.bz2 opensim-SC_OLD-d8d6e8a30415197eb55c59172abfb890ec7a46bd.tar.xz |
Merge branch 'master' into casper
Diffstat (limited to 'OpenSim/Tests/Clients')
-rw-r--r-- | OpenSim/Tests/Clients/Grid/GridClient.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Tests/Clients/Grid/GridClient.cs b/OpenSim/Tests/Clients/Grid/GridClient.cs index 8798c5e..972c0aa 100644 --- a/OpenSim/Tests/Clients/Grid/GridClient.cs +++ b/OpenSim/Tests/Clients/Grid/GridClient.cs | |||
@@ -44,9 +44,9 @@ namespace OpenSim.Tests.Clients.GridClient | |||
44 | { | 44 | { |
45 | public class GridClient | 45 | public class GridClient |
46 | { | 46 | { |
47 | private static readonly ILog m_log = | 47 | // private static readonly ILog m_log = |
48 | LogManager.GetLogger( | 48 | // LogManager.GetLogger( |
49 | MethodBase.GetCurrentMethod().DeclaringType); | 49 | // MethodBase.GetCurrentMethod().DeclaringType); |
50 | 50 | ||
51 | public static void Main(string[] args) | 51 | public static void Main(string[] args) |
52 | { | 52 | { |