aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer/GridServerBase.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid/GridServer/GridServerBase.cs')
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs7
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index a8ebd27..d83027a 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Grid.GridServer
77 { 77 {
78 base.Startup(); 78 base.Startup();
79 79
80 Config(); 80 m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml")));
81 81
82 SetupGridManager(); 82 SetupGridManager();
83 83
@@ -132,11 +132,6 @@ namespace OpenSim.Grid.GridServer
132 m_gridManager.Config = m_config; 132 m_gridManager.Config = m_config;
133 } 133 }
134 134
135 public void Config()
136 {
137 m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml")));
138 }
139
140 public void CheckSims(object sender, ElapsedEventArgs e) 135 public void CheckSims(object sender, ElapsedEventArgs e)
141 { 136 {
142 /* 137 /*