diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs index 0c3446d..39e731f 100644 --- a/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs +++ b/OpenSim/Region/OptionalModules/DataSnapshot/DataSnapshotManager.cs | |||
@@ -101,7 +101,7 @@ namespace OpenSim.Region.DataSnapshot | |||
101 | 101 | ||
102 | public void Initialise(IConfigSource config) | 102 | public void Initialise(IConfigSource config) |
103 | { | 103 | { |
104 | if (!m_configLoaded) | 104 | if (!m_configLoaded) |
105 | { | 105 | { |
106 | m_configLoaded = true; | 106 | m_configLoaded = true; |
107 | //m_log.Debug("[DATASNAPSHOT]: Loading configuration"); | 107 | //m_log.Debug("[DATASNAPSHOT]: Loading configuration"); |
@@ -114,12 +114,12 @@ namespace OpenSim.Region.DataSnapshot | |||
114 | string gatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", | 114 | string gatekeeper = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", |
115 | new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); | 115 | new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); |
116 | // Legacy. Remove soon! | 116 | // Legacy. Remove soon! |
117 | if (string.IsNullOrEmpty(gatekeeper)) | 117 | //// if (string.IsNullOrEmpty(gatekeeper)) |
118 | { | 118 | //// { |
119 | IConfig conf = config.Configs["GridService"]; | 119 | //// IConfig conf = config.Configs["GridService"]; |
120 | if (conf != null) | 120 | //// if (conf != null) |
121 | gatekeeper = conf.GetString("Gatekeeper", gatekeeper); | 121 | //// gatekeeper = conf.GetString("Gatekeeper", gatekeeper); |
122 | } | 122 | //// } |
123 | if (!string.IsNullOrEmpty(gatekeeper)) | 123 | if (!string.IsNullOrEmpty(gatekeeper)) |
124 | m_gridinfo.Add("gatekeeperURL", gatekeeper); | 124 | m_gridinfo.Add("gatekeeperURL", gatekeeper); |
125 | 125 | ||
@@ -248,7 +248,7 @@ namespace OpenSim.Region.DataSnapshot | |||
248 | m_snapStore.ForceSceneStale(scene); | 248 | m_snapStore.ForceSceneStale(scene); |
249 | } | 249 | } |
250 | 250 | ||
251 | public void Close() | 251 | public void Close() |
252 | { | 252 | { |
253 | if (!m_enabled) | 253 | if (!m_enabled) |
254 | return; | 254 | return; |
@@ -432,7 +432,6 @@ namespace OpenSim.Region.DataSnapshot | |||
432 | m_log.Info("[DATASNAPSHOT]: data service " + url + " notified. Secret: " + m_Secret); | 432 | m_log.Info("[DATASNAPSHOT]: data service " + url + " notified. Secret: " + m_Secret); |
433 | } | 433 | } |
434 | } | 434 | } |
435 | |||
436 | } | 435 | } |
437 | #endregion | 436 | #endregion |
438 | 437 | ||