diff options
author | Melanie Thielker | 2009-01-02 17:41:12 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-01-02 17:41:12 +0000 |
commit | 0138fdc5fddbe30924484686716465984e8f59c2 (patch) | |
tree | 3d734b2f626db149b14d945b424ece36e654673a /OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs | |
parent | Use only one (static) (de-)serializer for (de-)serializing SOPs. (diff) | |
download | opensim-SC-0138fdc5fddbe30924484686716465984e8f59c2.zip opensim-SC-0138fdc5fddbe30924484686716465984e8f59c2.tar.gz opensim-SC-0138fdc5fddbe30924484686716465984e8f59c2.tar.bz2 opensim-SC-0138fdc5fddbe30924484686716465984e8f59c2.tar.xz |
Allow some values that are set in OpenSim.ini to be set from region config
XML as well.
Diffstat (limited to 'OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs')
-rw-r--r-- | OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs index a371851..05ccc4d 100644 --- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs +++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs | |||
@@ -63,14 +63,14 @@ namespace OpenSim.Framework.RegionLoader.Filesystem | |||
63 | 63 | ||
64 | if (configFiles.Length == 0) | 64 | if (configFiles.Length == 0) |
65 | { | 65 | { |
66 | new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.xml"), false); | 66 | new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.xml"), false, m_configSource); |
67 | configFiles = Directory.GetFiles(regionConfigPath, "*.xml"); | 67 | configFiles = Directory.GetFiles(regionConfigPath, "*.xml"); |
68 | } | 68 | } |
69 | 69 | ||
70 | RegionInfo[] regionInfos = new RegionInfo[configFiles.Length]; | 70 | RegionInfo[] regionInfos = new RegionInfo[configFiles.Length]; |
71 | for (int i = 0; i < configFiles.Length; i++) | 71 | for (int i = 0; i < configFiles.Length; i++) |
72 | { | 72 | { |
73 | RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), configFiles[i], false); | 73 | RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), configFiles[i], false, m_configSource); |
74 | regionInfos[i] = regionInfo; | 74 | regionInfos[i] = regionInfo; |
75 | } | 75 | } |
76 | 76 | ||