diff options
Diffstat (limited to 'OpenSim/Grid/GridServer')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 10 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/GridServerBase.cs | 7 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/Program.cs | 6 |
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; | |||
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using System.Xml; | 32 | using System.Xml; |
33 | using libsecondlife; | 33 | using libsecondlife; |
34 | using log4net; | ||
34 | using Nwc.XmlRpc; | 35 | using Nwc.XmlRpc; |
35 | using OpenSim.Framework; | ||
36 | using OpenSim.Framework.Console; | ||
37 | using OpenSim.Data; | 36 | using OpenSim.Data; |
38 | using OpenSim.Framework.Servers; | ||
39 | using OpenSim.Data.MySQL; | 37 | using OpenSim.Data.MySQL; |
38 | using OpenSim.Framework; | ||
39 | using OpenSim.Framework.Servers; | ||
40 | 40 | ||
41 | namespace OpenSim.Grid.GridServer | 41 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
29 | using System.IO; | 30 | using System.IO; |
30 | using System.Timers; | 31 | using System.Timers; |
31 | using System.Collections; | 32 | using Mono.Addins; |
32 | using System.Collections.Generic; | ||
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Framework.Console; | 34 | using OpenSim.Framework.Console; |
35 | using OpenSim.Framework.Servers; | 35 | using OpenSim.Framework.Servers; |
36 | using Nwc.XmlRpc; | ||
37 | using Mono.Addins; | ||
38 | using Mono.Addins.Description; | ||
39 | 36 | ||
40 | namespace OpenSim.Grid.GridServer | 37 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using log4net.Config; |
30 | using System.Text; | ||
31 | using OpenSim.Framework.Console; | ||
32 | 30 | ||
33 | namespace OpenSim.Grid.GridServer | 31 | namespace 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 | ||