aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorMW2009-02-26 15:21:06 +0000
committerMW2009-02-26 15:21:06 +0000
commitde82bf9eb53cdd3be94b5a730b81c70d1e244b70 (patch)
tree82c00d621abfb853d7571e3889792704fa6424bf /OpenSim/Grid
parentAdd check in SceneManager to stop opensim.exe crashing if no regions/scenes w... (diff)
downloadopensim-SC_OLD-de82bf9eb53cdd3be94b5a730b81c70d1e244b70.zip
opensim-SC_OLD-de82bf9eb53cdd3be94b5a730b81c70d1e244b70.tar.gz
opensim-SC_OLD-de82bf9eb53cdd3be94b5a730b81c70d1e244b70.tar.bz2
opensim-SC_OLD-de82bf9eb53cdd3be94b5a730b81c70d1e244b70.tar.xz
Added a PostInitialise method to IApplicationPlugin, this allows us to do work in there knowing that all other ApplicationPlugins have been initialised by that time.
Moved the loadRegions code in LoadRegionsPlugin to the PostInitialise method.
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/GridServer/GridServerBase.cs33
-rw-r--r--OpenSim/Grid/UserServer/Main.cs4
2 files changed, 2 insertions, 35 deletions
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index 1bc3955..1ee97f4 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -176,39 +176,6 @@ namespace OpenSim.Grid.GridServer
176 176
177 public void CheckSims(object sender, ElapsedEventArgs e) 177 public void CheckSims(object sender, ElapsedEventArgs e)
178 { 178 {
179 /*
180 foreach (SimProfileBase sim in m_simProfileManager.SimProfiles.Values)
181 {
182 string SimResponse = String.Empty;
183 try
184 {
185 WebRequest CheckSim = WebRequest.Create("http://" + sim.sim_ip + ":" + sim.sim_port.ToString() + "/checkstatus/");
186 CheckSim.Method = "GET";
187 CheckSim.ContentType = "text/plaintext";
188 CheckSim.ContentLength = 0;
189
190 StreamWriter stOut = new StreamWriter(CheckSim.GetRequestStream(), System.Text.Encoding.ASCII);
191 stOut.Write(String.Empty);
192 stOut.Close();
193
194 StreamReader stIn = new StreamReader(CheckSim.GetResponse().GetResponseStream());
195 SimResponse = stIn.ReadToEnd();
196 stIn.Close();
197 }
198 catch
199 {
200 }
201
202 if (SimResponse == "OK")
203 {
204 m_simProfileManager.SimProfiles[sim.UUID].online = true;
205 }
206 else
207 {
208 m_simProfileManager.SimProfiles[sim.UUID].online = false;
209 }
210 }
211 */
212 } 179 }
213 180
214 public override void ShutdownSpecific() 181 public override void ShutdownSpecific()
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index dc38a3f..5a1dfd1 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -130,10 +130,10 @@ namespace OpenSim.Grid.UserServer
130 130
131 //Should be in modules? 131 //Should be in modules?
132 IInterServiceInventoryServices inventoryService = new OGS1InterServiceInventoryService(Cfg.InventoryUrl); 132 IInterServiceInventoryServices inventoryService = new OGS1InterServiceInventoryService(Cfg.InventoryUrl);
133 // IRegionProfileService regionProfileService = new RegionProfileServiceProxy(); 133 // IRegionProfileRouter regionProfileService = new RegionProfileServiceProxy();
134 134
135 RegisterInterface<IInterServiceInventoryServices>(inventoryService); 135 RegisterInterface<IInterServiceInventoryServices>(inventoryService);
136 // RegisterInterface<IRegionProfileService>(regionProfileService); 136 // RegisterInterface<IRegionProfileRouter>(regionProfileService);
137 137
138 return inventoryService; 138 return inventoryService;
139 } 139 }