Merge branch 'master' into careminster

This commit is contained in:
Melanie
2009-12-20 16:45:28 +00:00
10 changed files with 102 additions and 239 deletions

View File

@@ -44,9 +44,9 @@ namespace OpenSim.Tests.Clients.GridClient
{
public class GridClient
{
private static readonly ILog m_log =
LogManager.GetLogger(
MethodBase.GetCurrentMethod().DeclaringType);
// private static readonly ILog m_log =
// LogManager.GetLogger(
// MethodBase.GetCurrentMethod().DeclaringType);
public static void Main(string[] args)
{