diff options
author | Dr Scofield | 2009-04-17 09:23:26 +0000 |
---|---|---|
committer | Dr Scofield | 2009-04-17 09:23:26 +0000 |
commit | 3cb82ce383c06e8c1c5dea1a112c28e3faef3a60 (patch) | |
tree | dfc97dc3aff384c2b1034f7cbe6d1a64c04f5a2c | |
parent | fixes System.UnauthorizedAccessExceptions when trying to load OARs from (diff) | |
download | opensim-SC-3cb82ce383c06e8c1c5dea1a112c28e3faef3a60.zip opensim-SC-3cb82ce383c06e8c1c5dea1a112c28e3faef3a60.tar.gz opensim-SC-3cb82ce383c06e8c1c5dea1a112c28e3faef3a60.tar.bz2 opensim-SC-3cb82ce383c06e8c1c5dea1a112c28e3faef3a60.tar.xz |
quick fix for mantis #3477 --- m_configMember is being picked up by
MySQLEstateData.cs via reflection and then causes MySQL to get all
confused and panicky...
NOTE: the MySQL test cases are still very unhappy...
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/EstateSettings.cs | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index 4552a2f..10f41d4 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 m_configMember; | 38 | private readonly ConfigurationMember _configMember; |
39 | 39 | ||
40 | public delegate void SaveDelegate(EstateSettings rs); | 40 | public delegate void SaveDelegate(EstateSettings rs); |
41 | 41 | ||
@@ -43,12 +43,12 @@ namespace OpenSim.Framework | |||
43 | 43 | ||
44 | // Only the client uses these | 44 | // Only the client uses these |
45 | // | 45 | // |
46 | private uint m_estateId = 100; | 46 | private uint m_EstateId = 100; |
47 | 47 | ||
48 | public uint EstateID | 48 | public uint EstateID |
49 | { | 49 | { |
50 | get { return m_estateId; } | 50 | get { return m_EstateId; } |
51 | set { m_estateId = value; } | 51 | set { m_EstateId = value; } |
52 | } | 52 | } |
53 | 53 | ||
54 | private string m_EstateName; | 54 | private string m_EstateName; |
@@ -273,20 +273,20 @@ namespace OpenSim.Framework | |||
273 | 273 | ||
274 | public EstateSettings() | 274 | public EstateSettings() |
275 | { | 275 | { |
276 | if (m_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 | m_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 | m_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 | m_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 | // m_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 | // m_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 | m_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 | m_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 | m_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 | m_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 | m_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 | m_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 | m_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 | m_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 | m_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 | m_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 | m_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 | m_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 | m_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 | m_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 | m_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 | } |
@@ -466,7 +466,7 @@ namespace OpenSim.Framework | |||
466 | m_BillableFactor = (float) configuration_result; | 466 | m_BillableFactor = (float) configuration_result; |
467 | break; | 467 | break; |
468 | // case "estate_id": | 468 | // case "estate_id": |
469 | // m_estateId = (uint) configuration_result; | 469 | // m_EstateId = (uint) configuration_result; |
470 | // break; | 470 | // break; |
471 | // case "parent_estate_id": | 471 | // case "parent_estate_id": |
472 | // m_ParentEstateID = (uint) configuration_result; | 472 | // m_ParentEstateID = (uint) configuration_result; |