aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/General/Types/EstateSettings.cs
diff options
context:
space:
mode:
authorBrian McBee2007-08-03 18:01:55 +0000
committerBrian McBee2007-08-03 18:01:55 +0000
commit599a6d32eebc451f9284db8e6abf2946f236d5e9 (patch)
tree60ca29aaa58b0cf34b5f0514c95229602036895c /OpenSim/Framework/General/Types/EstateSettings.cs
parentYet another commit related to the SceneObject rewrites. (diff)
downloadopensim-SC_OLD-599a6d32eebc451f9284db8e6abf2946f236d5e9.zip
opensim-SC_OLD-599a6d32eebc451f9284db8e6abf2946f236d5e9.tar.gz
opensim-SC_OLD-599a6d32eebc451f9284db8e6abf2946f236d5e9.tar.bz2
opensim-SC_OLD-599a6d32eebc451f9284db8e6abf2946f236d5e9.tar.xz
Changes to prepare for future possible configuration of separate logdir, configdir, datadir.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/General/Types/EstateSettings.cs6
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 28using System.IO;
29using libsecondlife; 29using libsecondlife;
30using OpenSim.Framework.Configuration; 30using OpenSim.Framework.Configuration;
31using OpenSim.Framework.Utilities;
32
31namespace OpenSim.Framework.Types 33namespace 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