* Apparently, I broke reflection voodo. Reverting.

This fixes mantis #3477
author: lbsa71 2009-04-17 13:56:07 +0000
committer: lbsa71 2009-04-17 13:56:07 +0000
commit: 977f1e0373a869ec6f1572884f6869081ea31e23 (patch)
tree: a85718f8e8ae7bdaeb28d3a547501f54b2930caf
parent: adding log statement on shutdown in background mode (diff)
download: opensim-SC_OLD-977f1e0373a869ec6f1572884f6869081ea31e23.zip
opensim-SC_OLD-977f1e0373a869ec6f1572884f6869081ea31e23.tar.gz
opensim-SC_OLD-977f1e0373a869ec6f1572884f6869081ea31e23.tar.bz2
opensim-SC_OLD-977f1e0373a869ec6f1572884f6869081ea31e23.tar.xz
1 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 10f41d4..ec90956 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Framework
    public class EstateSettings
    {
        // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private readonly ConfigurationMember _configMember;
+        private readonly ConfigurationMember configMember;
        public delegate void SaveDelegate(EstateSettings rs);
@@ -273,20 +273,20 @@ namespace OpenSim.Framework
        public EstateSettings()
        {
-            if (_configMember == null)
+            if (configMember == null)
            {
                try
                {
                    // Load legacy defaults
                    //
-                    _configMember =
+                    configMember =
                        new ConfigurationMember(Path.Combine(Util.configDir(),
                                "estate_settings.xml"), "ESTATE SETTINGS",
                                loadConfigurationOptions,
                                handleIncomingConfiguration, true);
                    l_EstateManagers.Clear();
-                    _configMember.performConfigurationRetrieve();
+                    configMember.performConfigurationRetrieve();
                }
                catch (Exception)
                {
@@ -360,75 +360,75 @@ namespace OpenSim.Framework
        public void loadConfigurationOptions()
        {
-            _configMember.addConfigurationOption("billable_factor",
+            configMember.addConfigurationOption("billable_factor",
                    ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
                    String.Empty, "0.0", true);
-//            _configMember.addConfigurationOption("estate_id",
+//            configMember.addConfigurationOption("estate_id",
 //                    ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
 //                    String.Empty, "100", true);
-//            _configMember.addConfigurationOption("parent_estate_id",
+//            configMember.addConfigurationOption("parent_estate_id",
 //                    ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
 //                    String.Empty, "1", true);
-            _configMember.addConfigurationOption("redirect_grid_x",
+            configMember.addConfigurationOption("redirect_grid_x",
                    ConfigurationOption.ConfigurationTypes.TYPE_INT32,
                    String.Empty, "0", true);
-            _configMember.addConfigurationOption("redirect_grid_y",
+            configMember.addConfigurationOption("redirect_grid_y",
                    ConfigurationOption.ConfigurationTypes.TYPE_INT32,
                    String.Empty, "0", true);
-            _configMember.addConfigurationOption("price_per_meter",
+            configMember.addConfigurationOption("price_per_meter",
                    ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
                    String.Empty, "1", true);
-            _configMember.addConfigurationOption("estate_name",
+            configMember.addConfigurationOption("estate_name",
                    ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                    String.Empty, "My Estate", true);
-            _configMember.addConfigurationOption("estate_manager_0",
+            configMember.addConfigurationOption("estate_manager_0",
                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-            _configMember.addConfigurationOption("estate_manager_1",
+            configMember.addConfigurationOption("estate_manager_1",
                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-            _configMember.addConfigurationOption("estate_manager_2",
+            configMember.addConfigurationOption("estate_manager_2",
                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-            _configMember.addConfigurationOption("estate_manager_3",
+            configMember.addConfigurationOption("estate_manager_3",
                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-            _configMember.addConfigurationOption("estate_manager_4",
+            configMember.addConfigurationOption("estate_manager_4",
                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-            _configMember.addConfigurationOption("estate_manager_5",
+            configMember.addConfigurationOption("estate_manager_5",
                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-            _configMember.addConfigurationOption("estate_manager_6",
+            configMember.addConfigurationOption("estate_manager_6",
                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-            _configMember.addConfigurationOption("estate_manager_7",
+            configMember.addConfigurationOption("estate_manager_7",
                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-            _configMember.addConfigurationOption("estate_manager_8",
+            configMember.addConfigurationOption("estate_manager_8",
                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-            _configMember.addConfigurationOption("estate_manager_9",
+            configMember.addConfigurationOption("estate_manager_9",
                    ConfigurationOption.ConfigurationTypes.TYPE_UUID,
                    String.Empty, "00000000-0000-0000-0000-000000000000", true);
-            _configMember.addConfigurationOption("region_flags",
+            configMember.addConfigurationOption("region_flags",
                    ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
                    String.Empty, "336723974", true);
        }
author	lbsa71	2009-04-17 13:56:07 +0000
committer	lbsa71	2009-04-17 13:56:07 +0000
commit	977f1e0373a869ec6f1572884f6869081ea31e23 (patch)
tree	a85718f8e8ae7bdaeb28d3a547501f54b2930caf
parent	adding log statement on shutdown in background mode (diff)
download	opensim-SC_OLD-977f1e0373a869ec6f1572884f6869081ea31e23.zip opensim-SC_OLD-977f1e0373a869ec6f1572884f6869081ea31e23.tar.gz opensim-SC_OLD-977f1e0373a869ec6f1572884f6869081ea31e23.tar.bz2 opensim-SC_OLD-977f1e0373a869ec6f1572884f6869081ea31e23.tar.xz

diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index 10f41d4..ec90956 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Framework
35	public class EstateSettings	35	public class EstateSettings
36	{	36	{
37	// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);	37	// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
38	private readonly ConfigurationMember _configMember;	38	private readonly ConfigurationMember configMember;
39		39
40	public delegate void SaveDelegate(EstateSettings rs);	40	public delegate void SaveDelegate(EstateSettings rs);
41		41
@@ -273,20 +273,20 @@ namespace OpenSim.Framework
273		273
274	public EstateSettings()	274	public EstateSettings()
275	{	275	{
276	if (_configMember == null)	276	if (configMember == null)
277	{	277	{
278	try	278	try
279	{	279	{
280	// Load legacy defaults	280	// Load legacy defaults
281	//	281	//
282	_configMember =	282	configMember =
283	new ConfigurationMember(Path.Combine(Util.configDir(),	283	new ConfigurationMember(Path.Combine(Util.configDir(),
284	"estate_settings.xml"), "ESTATE SETTINGS",	284	"estate_settings.xml"), "ESTATE SETTINGS",
285	loadConfigurationOptions,	285	loadConfigurationOptions,
286	handleIncomingConfiguration, true);	286	handleIncomingConfiguration, true);
287		287
288	l_EstateManagers.Clear();	288	l_EstateManagers.Clear();
289	_configMember.performConfigurationRetrieve();	289	configMember.performConfigurationRetrieve();
290	}	290	}
291	catch (Exception)	291	catch (Exception)
292	{	292	{
@@ -360,75 +360,75 @@ namespace OpenSim.Framework
360		360
361	public void loadConfigurationOptions()	361	public void loadConfigurationOptions()
362	{	362	{
363	_configMember.addConfigurationOption("billable_factor",	363	configMember.addConfigurationOption("billable_factor",
364	ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,	364	ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
365	String.Empty, "0.0", true);	365	String.Empty, "0.0", true);
366		366
367	// _configMember.addConfigurationOption("estate_id",	367	// configMember.addConfigurationOption("estate_id",
368	// ConfigurationOption.ConfigurationTypes.TYPE_UINT32,	368	// ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
369	// String.Empty, "100", true);	369	// String.Empty, "100", true);
370		370
371	// _configMember.addConfigurationOption("parent_estate_id",	371	// configMember.addConfigurationOption("parent_estate_id",
372	// ConfigurationOption.ConfigurationTypes.TYPE_UINT32,	372	// ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
373	// String.Empty, "1", true);	373	// String.Empty, "1", true);
374		374
375	_configMember.addConfigurationOption("redirect_grid_x",	375	configMember.addConfigurationOption("redirect_grid_x",
376	ConfigurationOption.ConfigurationTypes.TYPE_INT32,	376	ConfigurationOption.ConfigurationTypes.TYPE_INT32,
377	String.Empty, "0", true);	377	String.Empty, "0", true);
378		378
379	_configMember.addConfigurationOption("redirect_grid_y",	379	configMember.addConfigurationOption("redirect_grid_y",
380	ConfigurationOption.ConfigurationTypes.TYPE_INT32,	380	ConfigurationOption.ConfigurationTypes.TYPE_INT32,
381	String.Empty, "0", true);	381	String.Empty, "0", true);
382		382
383	_configMember.addConfigurationOption("price_per_meter",	383	configMember.addConfigurationOption("price_per_meter",
384	ConfigurationOption.ConfigurationTypes.TYPE_UINT32,	384	ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
385	String.Empty, "1", true);	385	String.Empty, "1", true);
386		386
387	_configMember.addConfigurationOption("estate_name",	387	configMember.addConfigurationOption("estate_name",
388	ConfigurationOption.ConfigurationTypes.TYPE_STRING,	388	ConfigurationOption.ConfigurationTypes.TYPE_STRING,
389	String.Empty, "My Estate", true);	389	String.Empty, "My Estate", true);
390		390
391	_configMember.addConfigurationOption("estate_manager_0",	391	configMember.addConfigurationOption("estate_manager_0",
392	ConfigurationOption.ConfigurationTypes.TYPE_UUID,	392	ConfigurationOption.ConfigurationTypes.TYPE_UUID,
393	String.Empty, "00000000-0000-0000-0000-000000000000", true);	393	String.Empty, "00000000-0000-0000-0000-000000000000", true);
394		394
395	_configMember.addConfigurationOption("estate_manager_1",	395	configMember.addConfigurationOption("estate_manager_1",
396	ConfigurationOption.ConfigurationTypes.TYPE_UUID,	396	ConfigurationOption.ConfigurationTypes.TYPE_UUID,
397	String.Empty, "00000000-0000-0000-0000-000000000000", true);	397	String.Empty, "00000000-0000-0000-0000-000000000000", true);
398		398
399	_configMember.addConfigurationOption("estate_manager_2",	399	configMember.addConfigurationOption("estate_manager_2",
400	ConfigurationOption.ConfigurationTypes.TYPE_UUID,	400	ConfigurationOption.ConfigurationTypes.TYPE_UUID,
401	String.Empty, "00000000-0000-0000-0000-000000000000", true);	401	String.Empty, "00000000-0000-0000-0000-000000000000", true);
402		402
403	_configMember.addConfigurationOption("estate_manager_3",	403	configMember.addConfigurationOption("estate_manager_3",
404	ConfigurationOption.ConfigurationTypes.TYPE_UUID,	404	ConfigurationOption.ConfigurationTypes.TYPE_UUID,
405	String.Empty, "00000000-0000-0000-0000-000000000000", true);	405	String.Empty, "00000000-0000-0000-0000-000000000000", true);
406		406
407	_configMember.addConfigurationOption("estate_manager_4",	407	configMember.addConfigurationOption("estate_manager_4",
408	ConfigurationOption.ConfigurationTypes.TYPE_UUID,	408	ConfigurationOption.ConfigurationTypes.TYPE_UUID,
409	String.Empty, "00000000-0000-0000-0000-000000000000", true);	409	String.Empty, "00000000-0000-0000-0000-000000000000", true);
410		410
411	_configMember.addConfigurationOption("estate_manager_5",	411	configMember.addConfigurationOption("estate_manager_5",
412	ConfigurationOption.ConfigurationTypes.TYPE_UUID,	412	ConfigurationOption.ConfigurationTypes.TYPE_UUID,
413	String.Empty, "00000000-0000-0000-0000-000000000000", true);	413	String.Empty, "00000000-0000-0000-0000-000000000000", true);
414		414
415	_configMember.addConfigurationOption("estate_manager_6",	415	configMember.addConfigurationOption("estate_manager_6",
416	ConfigurationOption.ConfigurationTypes.TYPE_UUID,	416	ConfigurationOption.ConfigurationTypes.TYPE_UUID,
417	String.Empty, "00000000-0000-0000-0000-000000000000", true);	417	String.Empty, "00000000-0000-0000-0000-000000000000", true);
418		418
419	_configMember.addConfigurationOption("estate_manager_7",	419	configMember.addConfigurationOption("estate_manager_7",
420	ConfigurationOption.ConfigurationTypes.TYPE_UUID,	420	ConfigurationOption.ConfigurationTypes.TYPE_UUID,
421	String.Empty, "00000000-0000-0000-0000-000000000000", true);	421	String.Empty, "00000000-0000-0000-0000-000000000000", true);
422		422
423	_configMember.addConfigurationOption("estate_manager_8",	423	configMember.addConfigurationOption("estate_manager_8",
424	ConfigurationOption.ConfigurationTypes.TYPE_UUID,	424	ConfigurationOption.ConfigurationTypes.TYPE_UUID,
425	String.Empty, "00000000-0000-0000-0000-000000000000", true);	425	String.Empty, "00000000-0000-0000-0000-000000000000", true);
426		426
427	_configMember.addConfigurationOption("estate_manager_9",	427	configMember.addConfigurationOption("estate_manager_9",
428	ConfigurationOption.ConfigurationTypes.TYPE_UUID,	428	ConfigurationOption.ConfigurationTypes.TYPE_UUID,
429	String.Empty, "00000000-0000-0000-0000-000000000000", true);	429	String.Empty, "00000000-0000-0000-0000-000000000000", true);
430		430
431	_configMember.addConfigurationOption("region_flags",	431	configMember.addConfigurationOption("region_flags",
432	ConfigurationOption.ConfigurationTypes.TYPE_UINT32,	432	ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
433	String.Empty, "336723974", true);	433	String.Empty, "336723974", true);
434	}	434	}