diff options
author | UbitUmarov | 2018-01-22 19:56:40 +0000 |
---|---|---|
committer | UbitUmarov | 2018-01-22 19:56:40 +0000 |
commit | e326792aa3efe3b0bc3259ff745cefbf640a9e88 (patch) | |
tree | 349c429aba173c8450aebeac88ecb2d9fbabddd3 /OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs | |
parent | change throtle datasnapshot get (diff) | |
download | opensim-SC-e326792aa3efe3b0bc3259ff745cefbf640a9e88.zip opensim-SC-e326792aa3efe3b0bc3259ff745cefbf640a9e88.tar.gz opensim-SC-e326792aa3efe3b0bc3259ff745cefbf640a9e88.tar.bz2 opensim-SC-e326792aa3efe3b0bc3259ff745cefbf640a9e88.tar.xz |
move datasnapshot notification to when region is actually loaded
Diffstat (limited to 'OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs index bf9c14d..ab61be9 100644 --- a/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs | |||
@@ -164,19 +164,6 @@ namespace OpenSim.Region.DataSnapshot | |||
164 | 164 | ||
165 | m_log.DebugFormat("[DATASNAPSHOT]: Module added to Scene {0}.", scene.RegionInfo.RegionName); | 165 | m_log.DebugFormat("[DATASNAPSHOT]: Module added to Scene {0}.", scene.RegionInfo.RegionName); |
166 | 166 | ||
167 | if (!m_servicesNotified) | ||
168 | { | ||
169 | m_hostname = scene.RegionInfo.ExternalHostName; | ||
170 | m_snapStore = new SnapshotStore(m_snapsDir, m_gridinfo, m_listener_port, m_hostname); | ||
171 | |||
172 | //Hand it the first scene, assuming that all scenes have the same BaseHTTPServer | ||
173 | new DataRequestHandler(scene, this); | ||
174 | |||
175 | if (m_dataServices != "" && m_dataServices != "noservices") | ||
176 | NotifyDataServices(m_dataServices, "online"); | ||
177 | |||
178 | m_servicesNotified = true; | ||
179 | } | ||
180 | 167 | ||
181 | m_scenes.Add(scene); | 168 | m_scenes.Add(scene); |
182 | m_snapStore.AddScene(scene); | 169 | m_snapStore.AddScene(scene); |
@@ -248,6 +235,20 @@ namespace OpenSim.Region.DataSnapshot | |||
248 | 235 | ||
249 | m_log.DebugFormat("[DATASNAPSHOT]: Marking scene {0} as stale.", scene.RegionInfo.RegionName); | 236 | m_log.DebugFormat("[DATASNAPSHOT]: Marking scene {0} as stale.", scene.RegionInfo.RegionName); |
250 | m_snapStore.ForceSceneStale(scene); | 237 | m_snapStore.ForceSceneStale(scene); |
238 | |||
239 | if (!m_servicesNotified) | ||
240 | { | ||
241 | m_hostname = scene.RegionInfo.ExternalHostName; | ||
242 | m_snapStore = new SnapshotStore(m_snapsDir, m_gridinfo, m_listener_port, m_hostname); | ||
243 | |||
244 | //Hand it the first scene, assuming that all scenes have the same BaseHTTPServer | ||
245 | new DataRequestHandler(scene, this); | ||
246 | |||
247 | if (m_dataServices != "" && m_dataServices != "noservices") | ||
248 | NotifyDataServices(m_dataServices, "online"); | ||
249 | |||
250 | m_servicesNotified = true; | ||
251 | } | ||
251 | } | 252 | } |
252 | 253 | ||
253 | public void Close() | 254 | public void Close() |