aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs29
-rw-r--r--bin/OpenSim.ini.example3
-rw-r--r--bin/OpenSimDefaults.ini7
3 files changed, 34 insertions, 5 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index ddaf8de..f7b2338 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -29,8 +29,10 @@
29using System; 29using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO; 31using System.IO;
32using System.Linq;
32using System.Net; 33using System.Net;
33using System.Reflection; 34using System.Reflection;
35using System.Text;
34using System.Xml; 36using System.Xml;
35using log4net; 37using log4net;
36using Nini.Config; 38using Nini.Config;
@@ -131,9 +133,12 @@ namespace OpenSim.Region.DataSnapshot
131 m_period = config.Configs["DataSnapshot"].GetInt("default_snapshot_period", m_period); 133 m_period = config.Configs["DataSnapshot"].GetInt("default_snapshot_period", m_period);
132 m_maxStales = config.Configs["DataSnapshot"].GetInt("max_changes_before_update", m_maxStales); 134 m_maxStales = config.Configs["DataSnapshot"].GetInt("max_changes_before_update", m_maxStales);
133 m_snapsDir = config.Configs["DataSnapshot"].GetString("snapshot_cache_directory", m_snapsDir); 135 m_snapsDir = config.Configs["DataSnapshot"].GetString("snapshot_cache_directory", m_snapsDir);
134 m_dataServices = config.Configs["DataSnapshot"].GetString("data_services", m_dataServices);
135 m_listener_port = config.Configs["Network"].GetString("http_listener_port", m_listener_port); 136 m_listener_port = config.Configs["Network"].GetString("http_listener_port", m_listener_port);
136 137
138 m_dataServices = config.Configs["DataSnapshot"].GetString("data_services", m_dataServices);
139 // New way of spec'ing data services, one per line
140 AddDataServicesVars(config.Configs["DataSnapshot"]);
141
137 String[] annoying_string_array = config.Configs["DataSnapshot"].GetString("disable_modules", "").Split(".".ToCharArray()); 142 String[] annoying_string_array = config.Configs["DataSnapshot"].GetString("disable_modules", "").Split(".".ToCharArray());
138 foreach (String bloody_wanker in annoying_string_array) 143 foreach (String bloody_wanker in annoying_string_array)
139 { 144 {
@@ -289,6 +294,28 @@ namespace OpenSim.Region.DataSnapshot
289 return null; 294 return null;
290 } 295 }
291 296
297 private void AddDataServicesVars(IConfig config)
298 {
299 // Make sure the services given this way aren't in m_dataServices already
300 List<string> servs = new List<string>(m_dataServices.Split(new char[] { ';' }));
301
302 StringBuilder sb = new StringBuilder();
303 string[] keys = config.GetKeys();
304
305 if (keys.Length > 0)
306 {
307 IEnumerable<string> serviceKeys = keys.Where(value => value.StartsWith("DATA_SRV_"));
308 foreach (string serviceKey in serviceKeys)
309 {
310 string keyValue = config.GetString(serviceKey, string.Empty).Trim();
311 if (!servs.Contains(keyValue))
312 sb.Append(keyValue).Append(";");
313 }
314 }
315
316 m_dataServices = (m_dataServices == "noservices") ? sb.ToString() : sb.Append(m_dataServices).ToString();
317 }
318
292 #endregion 319 #endregion
293 320
294 #region [Public] Snapshot storage functions 321 #region [Public] Snapshot storage functions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 045fa88..8714c6a 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -797,12 +797,15 @@
797 ;; the data snapshots. 797 ;; the data snapshots.
798 ; snapshot_cache_directory = "DataSnapshot" 798 ; snapshot_cache_directory = "DataSnapshot"
799 799
800 ;; [Supported, but obsolete]
800 ;# {data_services} {index_sims:true} {Data service URLs to register with?} {} http://metaverseink.com/cgi-bin/register.py 801 ;# {data_services} {index_sims:true} {Data service URLs to register with?} {} http://metaverseink.com/cgi-bin/register.py
801 ; This semicolon-separated string serves to notify specific data services 802 ; This semicolon-separated string serves to notify specific data services
802 ; about the existence of this sim. Uncomment if you want to index your 803 ; about the existence of this sim. Uncomment if you want to index your
803 ; data with this and/or other search providers. 804 ; data with this and/or other search providers.
804 ; data_services="http://metaverseink.com/cgi-bin/register.py" 805 ; data_services="http://metaverseink.com/cgi-bin/register.py"
805 806
807 ;; New way of specifying data services, one per service
808 ;DATA_SRV_MISearch = "http://metaverseink.com/cgi-bin/register.py"
806 809
807[Economy] 810[Economy]
808 ;# {SellEnabled} {} {Enable selling for 0?} {true false} true 811 ;# {SellEnabled} {} {Enable selling for 0?} {true false} true
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index d12814d..ad33423 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1400,10 +1400,9 @@
1400 ; This will be created in bin, if it doesn't exist already. It will hold the data snapshots. 1400 ; This will be created in bin, if it doesn't exist already. It will hold the data snapshots.
1401 snapshot_cache_directory = "DataSnapshot" 1401 snapshot_cache_directory = "DataSnapshot"
1402 1402
1403 ; This semicolon-separated string serves to notify specific data services about the existence 1403 ; Uncomment if you want to index your data with this and/or other search providers. One entry per
1404 ; of this sim. Uncomment if you want to index your data with this and/or other search providers. 1404 ; data service
1405 ;data_services="http://metaverseink.com/cgi-bin/register.py" 1405 ;DATA_SRV_MISearch = "http://metaverseink.com/cgi-bin/register.py"
1406
1407 1406
1408[Economy] 1407[Economy]
1409 ; These economy values get used in the BetaGridLikeMoneyModule. - This module is for demonstration only - 1408 ; These economy values get used in the BetaGridLikeMoneyModule. - This module is for demonstration only -