diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs index 1ed403e..58e6765 100644 --- a/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs | |||
@@ -150,11 +150,8 @@ namespace OpenSim.Region.DataSnapshot | |||
150 | m_enabled = false; | 150 | m_enabled = false; |
151 | return; | 151 | return; |
152 | } | 152 | } |
153 | |||
154 | } | 153 | } |
155 | |||
156 | } | 154 | } |
157 | |||
158 | } | 155 | } |
159 | 156 | ||
160 | public void AddRegion(Scene scene) | 157 | public void AddRegion(Scene scene) |
@@ -208,24 +205,16 @@ namespace OpenSim.Region.DataSnapshot | |||
208 | if (!m_enabled) | 205 | if (!m_enabled) |
209 | return; | 206 | return; |
210 | 207 | ||
211 | 208 | if (m_snapStore == null) | |
212 | if (!m_servicesNotified) | ||
213 | { | 209 | { |
214 | m_hostname = scene.RegionInfo.ExternalHostName; | 210 | m_hostname = scene.RegionInfo.ExternalHostName; |
215 | m_snapStore = new SnapshotStore(m_snapsDir, m_gridinfo, m_listener_port, m_hostname); | 211 | m_snapStore = new SnapshotStore(m_snapsDir, m_gridinfo, m_listener_port, m_hostname); |
216 | 212 | ||
217 | //Hand it the first scene, assuming that all scenes have the same BaseHTTPServer | 213 | //Hand it the first scene, assuming that all scenes have the same BaseHTTPServer |
218 | new DataRequestHandler(scene, this); | 214 | new DataRequestHandler(scene, this); |
219 | |||
220 | if (m_dataServices != "" && m_dataServices != "noservices") | ||
221 | NotifyDataServices(m_dataServices, "online"); | ||
222 | |||
223 | m_servicesNotified = true; | ||
224 | } | 215 | } |
225 | 216 | ||
226 | m_snapStore.AddScene(scene); | 217 | m_snapStore.AddScene(scene); |
227 | m_log.DebugFormat("[DATASNAPSHOT]: Marking scene {0} as stale.", scene.RegionInfo.RegionName); | ||
228 | m_snapStore.ForceSceneStale(scene); | ||
229 | 218 | ||
230 | Assembly currentasm = Assembly.GetExecutingAssembly(); | 219 | Assembly currentasm = Assembly.GetExecutingAssembly(); |
231 | 220 | ||
@@ -250,6 +239,13 @@ namespace OpenSim.Region.DataSnapshot | |||
250 | } | 239 | } |
251 | } | 240 | } |
252 | 241 | ||
242 | if (!m_servicesNotified) | ||
243 | { | ||
244 | if (m_dataServices != "" && m_dataServices != "noservices") | ||
245 | NotifyDataServices(m_dataServices, "online"); | ||
246 | |||
247 | m_servicesNotified = true; | ||
248 | } | ||
253 | } | 249 | } |
254 | 250 | ||
255 | public void Close() | 251 | public void Close() |
@@ -261,7 +257,6 @@ namespace OpenSim.Region.DataSnapshot | |||
261 | NotifyDataServices(m_dataServices, "offline"); | 257 | NotifyDataServices(m_dataServices, "offline"); |
262 | } | 258 | } |
263 | 259 | ||
264 | |||
265 | public string Name | 260 | public string Name |
266 | { | 261 | { |
267 | get { return "External Data Generator"; } | 262 | get { return "External Data Generator"; } |