diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Grid/GridServer/GridServerBase.cs (renamed from OpenSim/Grid/GridServer/Main.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/Program.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/GridServerBase.cs index 5d21750..592883a 100644 --- a/OpenSim/Grid/GridServer/Main.cs +++ b/OpenSim/Grid/GridServer/GridServerBase.cs | |||
@@ -37,7 +37,7 @@ namespace OpenSim.Grid.GridServer | |||
37 | { | 37 | { |
38 | /// <summary> | 38 | /// <summary> |
39 | /// </summary> | 39 | /// </summary> |
40 | public class OpenGrid_Main : BaseOpenSimServer, conscmd_callback | 40 | public class GridServerBase : BaseOpenSimServer, conscmd_callback |
41 | { | 41 | { |
42 | private GridConfig m_config; | 42 | private GridConfig m_config; |
43 | private GridManager m_gridManager; | 43 | private GridManager m_gridManager; |
@@ -52,7 +52,7 @@ namespace OpenSim.Grid.GridServer | |||
52 | } | 52 | } |
53 | } | 53 | } |
54 | 54 | ||
55 | public OpenGrid_Main( ) | 55 | public GridServerBase( ) |
56 | { | 56 | { |
57 | m_console = new ConsoleBase("OpenGrid", this); | 57 | m_console = new ConsoleBase("OpenGrid", this); |
58 | MainConsole.Instance = m_console; | 58 | MainConsole.Instance = m_console; |
diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Grid/GridServer/Program.cs index 7247a63..8ca04df 100644 --- a/OpenSim/Grid/GridServer/Program.cs +++ b/OpenSim/Grid/GridServer/Program.cs | |||
@@ -12,7 +12,7 @@ namespace OpenSim.Grid.GridServer | |||
12 | { | 12 | { |
13 | log4net.Config.XmlConfigurator.Configure(); | 13 | log4net.Config.XmlConfigurator.Configure(); |
14 | 14 | ||
15 | OpenGrid_Main app = new OpenGrid_Main(); | 15 | GridServerBase app = new GridServerBase(); |
16 | 16 | ||
17 | if (args.Length > 0 && args[0] == "-setuponly") | 17 | if (args.Length > 0 && args[0] == "-setuponly") |
18 | { | 18 | { |