aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-08-09 21:01:33 +0000
committerJustin Clarke Casey2008-08-09 21:01:33 +0000
commit6630706dd9507c216a88de66dca8d4439c03ac49 (patch)
tree86e977e38c43bebc8f7fc6450f2f03123554dd5c /OpenSim/Grid/GridServer
parent* minor: oops, forgot the code that actually ends up eliminating the unused c... (diff)
downloadopensim-SC_OLD-6630706dd9507c216a88de66dca8d4439c03ac49.zip
opensim-SC_OLD-6630706dd9507c216a88de66dca8d4439c03ac49.tar.gz
opensim-SC_OLD-6630706dd9507c216a88de66dca8d4439c03ac49.tar.bz2
opensim-SC_OLD-6630706dd9507c216a88de66dca8d4439c03ac49.tar.xz
* Reinstate grid receive and send keys to user server config
* Looks like these weren't so unused after all - oops! * Remove message from grid server config
Diffstat (limited to 'OpenSim/Grid/GridServer')
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs7
-rw-r--r--OpenSim/Grid/GridServer/Program.cs14
2 files changed, 8 insertions, 13 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 /*
diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Grid/GridServer/Program.cs
index 6eb4e15..8094906 100644
--- a/OpenSim/Grid/GridServer/Program.cs
+++ b/OpenSim/Grid/GridServer/Program.cs
@@ -39,15 +39,15 @@ namespace OpenSim.Grid.GridServer
39 39
40 GridServerBase app = new GridServerBase(); 40 GridServerBase app = new GridServerBase();
41 41
42 if (args.Length > 0 && args[0] == "-setuponly") 42// if (args.Length > 0 && args[0] == "-setuponly")
43 { 43// {
44 app.Config(); 44// app.Config();
45 } 45// }
46 else 46// else
47 { 47// {
48 app.Startup(); 48 app.Startup();
49 app.Work(); 49 app.Work();
50 } 50// }
51 } 51 }
52 } 52 }
53} 53}