diff options
Diffstat (limited to 'OpenSim/Framework/General/Types/EstateSettings.cs')
-rw-r--r-- | OpenSim/Framework/General/Types/EstateSettings.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Framework/General/Types/EstateSettings.cs b/OpenSim/Framework/General/Types/EstateSettings.cs index 11594fd..ae61752 100644 --- a/OpenSim/Framework/General/Types/EstateSettings.cs +++ b/OpenSim/Framework/General/Types/EstateSettings.cs | |||
@@ -25,9 +25,11 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | 28 | using System.IO; | |
29 | using libsecondlife; | 29 | using libsecondlife; |
30 | using OpenSim.Framework.Configuration; | 30 | using OpenSim.Framework.Configuration; |
31 | using OpenSim.Framework.Utilities; | ||
32 | |||
31 | namespace OpenSim.Framework.Types | 33 | namespace OpenSim.Framework.Types |
32 | { | 34 | { |
33 | public class EstateSettings | 35 | public class EstateSettings |
@@ -554,7 +556,7 @@ namespace OpenSim.Framework.Types | |||
554 | private ConfigurationMember configMember; | 556 | private ConfigurationMember configMember; |
555 | public EstateSettings() | 557 | public EstateSettings() |
556 | { | 558 | { |
557 | configMember = new ConfigurationMember("estate_settings.xml", "ESTATE SETTINGS", this.loadConfigurationOptions, this.handleIncomingConfiguration); | 559 | configMember = new ConfigurationMember(Path.Combine(Util.configDir(),"estate_settings.xml"), "ESTATE SETTINGS", this.loadConfigurationOptions, this.handleIncomingConfiguration); |
558 | configMember.performConfigurationRetrieve(); | 560 | configMember.performConfigurationRetrieve(); |
559 | } | 561 | } |
560 | 562 | ||