aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid/GridServer')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs10
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs7
-rw-r--r--OpenSim/Grid/GridServer/Program.cs6
3 files changed, 9 insertions, 14 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index ba526c0..ee2f129 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -31,18 +31,18 @@ using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using System.Xml; 32using System.Xml;
33using libsecondlife; 33using libsecondlife;
34using log4net;
34using Nwc.XmlRpc; 35using Nwc.XmlRpc;
35using OpenSim.Framework;
36using OpenSim.Framework.Console;
37using OpenSim.Data; 36using OpenSim.Data;
38using OpenSim.Framework.Servers;
39using OpenSim.Data.MySQL; 37using OpenSim.Data.MySQL;
38using OpenSim.Framework;
39using OpenSim.Framework.Servers;
40 40
41namespace OpenSim.Grid.GridServer 41namespace OpenSim.Grid.GridServer
42{ 42{
43 public class GridManager 43 public class GridManager
44 { 44 {
45 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 46
47 private Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>(); 47 private Dictionary<string, IGridData> _plugins = new Dictionary<string, IGridData>();
48 private Dictionary<string, ILogData> _logplugins = new Dictionary<string, ILogData>(); 48 private Dictionary<string, ILogData> _logplugins = new Dictionary<string, ILogData>();
@@ -630,7 +630,7 @@ namespace OpenSim.Grid.GridServer
630 //OpenSim.Data.MySQL.MySQLGridData dbengine = new OpenSim.Data.MySQL.MySQLGridData(); 630 //OpenSim.Data.MySQL.MySQLGridData dbengine = new OpenSim.Data.MySQL.MySQLGridData();
631 try 631 try
632 { 632 {
633 OpenSim.Data.MySQL.MySQLGridData mysqldata = (OpenSim.Data.MySQL.MySQLGridData)(kvp.Value); 633 MySQLGridData mysqldata = (MySQLGridData)(kvp.Value);
634 //DataResponse insertResponse = mysqldata.DeleteProfile(TheSim); 634 //DataResponse insertResponse = mysqldata.DeleteProfile(TheSim);
635 DataResponse insertResponse = mysqldata.DeleteProfile(uuid); 635 DataResponse insertResponse = mysqldata.DeleteProfile(uuid);
636 switch (insertResponse) 636 switch (insertResponse)
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index 3be98d8..2feaac3 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -26,16 +26,13 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
29using System.IO; 30using System.IO;
30using System.Timers; 31using System.Timers;
31using System.Collections; 32using Mono.Addins;
32using System.Collections.Generic;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
35using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
36using Nwc.XmlRpc;
37using Mono.Addins;
38using Mono.Addins.Description;
39 36
40namespace OpenSim.Grid.GridServer 37namespace OpenSim.Grid.GridServer
41{ 38{
diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Grid/GridServer/Program.cs
index b95e422..6eb4e15 100644
--- a/OpenSim/Grid/GridServer/Program.cs
+++ b/OpenSim/Grid/GridServer/Program.cs
@@ -26,9 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using log4net.Config;
30using System.Text;
31using OpenSim.Framework.Console;
32 30
33namespace OpenSim.Grid.GridServer 31namespace OpenSim.Grid.GridServer
34{ 32{
@@ -37,7 +35,7 @@ namespace OpenSim.Grid.GridServer
37 [STAThread] 35 [STAThread]
38 public static void Main(string[] args) 36 public static void Main(string[] args)
39 { 37 {
40 log4net.Config.XmlConfigurator.Configure(); 38 XmlConfigurator.Configure();
41 39
42 GridServerBase app = new GridServerBase(); 40 GridServerBase app = new GridServerBase();
43 41