aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Clients/Grid/GridClient.cs
diff options
context:
space:
mode:
authorMelanie2009-12-20 16:45:28 +0000
committerMelanie2009-12-20 16:45:28 +0000
commit3d3e0ea4f38b343edc19b7530fbac28b84b53ecf (patch)
treeb22a6e71dca45c15f98df996182239186259b6d3 /OpenSim/Tests/Clients/Grid/GridClient.cs
parentMerge branch 'casper' (diff)
parentFix a case where an idle sim can eat 100% of a core (diff)
downloadopensim-SC-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.zip
opensim-SC-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.tar.gz
opensim-SC-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.tar.bz2
opensim-SC-3d3e0ea4f38b343edc19b7530fbac28b84b53ecf.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Tests/Clients/Grid/GridClient.cs6
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 {