diff options
| author | Adam Frisby | 2007-10-22 21:57:32 +0000 |
|---|---|---|
| committer | Adam Frisby | 2007-10-22 21:57:32 +0000 |
| commit | 5dad0ed7296b4abfe2c934a8404022a4d2189051 (patch) | |
| tree | a1151b7ba2e093e947034b40ad10b8614137cf05 /OpenSim/Framework/General | |
| parent | * Made EstateSetting static since there's only one instance, and we only need... (diff) | |
| download | opensim-SC-5dad0ed7296b4abfe2c934a8404022a4d2189051.zip opensim-SC-5dad0ed7296b4abfe2c934a8404022a4d2189051.tar.gz opensim-SC-5dad0ed7296b4abfe2c934a8404022a4d2189051.tar.bz2 opensim-SC-5dad0ed7296b4abfe2c934a8404022a4d2189051.tar.xz | |
* Return of R2162. /Take that SVN!/
Diffstat (limited to 'OpenSim/Framework/General')
| -rw-r--r-- | OpenSim/Framework/General/Types/EstateSettings.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Framework/General/Types/EstateSettings.cs b/OpenSim/Framework/General/Types/EstateSettings.cs index abdcf6f..2675e52 100644 --- a/OpenSim/Framework/General/Types/EstateSettings.cs +++ b/OpenSim/Framework/General/Types/EstateSettings.cs | |||
| @@ -557,8 +557,12 @@ namespace OpenSim.Framework.Types | |||
| 557 | private ConfigurationMember configMember; | 557 | private ConfigurationMember configMember; |
| 558 | public EstateSettings() | 558 | public EstateSettings() |
| 559 | { | 559 | { |
| 560 | configMember = new ConfigurationMember(Path.Combine(Util.configDir(),"estate_settings.xml"), "ESTATE SETTINGS", this.loadConfigurationOptions, this.handleIncomingConfiguration); | 560 | // Temporary hack to prevent multiple loadings. |
| 561 | configMember.performConfigurationRetrieve(); | 561 | if (configMember == null) |
| 562 | { | ||
| 563 | configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", this.loadConfigurationOptions, this.handleIncomingConfiguration); | ||
| 564 | configMember.performConfigurationRetrieve(); | ||
| 565 | } | ||
| 562 | } | 566 | } |
| 563 | 567 | ||
| 564 | public void loadConfigurationOptions() | 568 | public void loadConfigurationOptions() |