aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2009-09-06 15:55:57 +0100
committerMelanie2009-09-06 15:55:57 +0100
commit67d9a6bcc15fe3fdc499d674276461a5eddd14ce (patch)
treee7e30625f5079e5960480557f7e8a82fcaf74f82 /OpenSim/Framework
parentRemove the encryption from the IAuthenticationService interface. That (diff)
parent* Typo in previous commit. (diff)
downloadopensim-SC-67d9a6bcc15fe3fdc499d674276461a5eddd14ce.zip
opensim-SC-67d9a6bcc15fe3fdc499d674276461a5eddd14ce.tar.gz
opensim-SC-67d9a6bcc15fe3fdc499d674276461a5eddd14ce.tar.bz2
opensim-SC-67d9a6bcc15fe3fdc499d674276461a5eddd14ce.tar.xz
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
index 44f44fe..63e09ae 100644
--- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
+++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
@@ -78,6 +78,7 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
78 78
79 foreach (IConfig config in source.Configs) 79 foreach (IConfig config in source.Configs)
80 { 80 {
81 //m_log.Info("[REGIONLOADERFILESYSTEM]: Creating RegionInfo for " + config.Name);
81 RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), file, false, m_configSource, config.Name); 82 RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), file, false, m_configSource, config.Name);
82 regionInfos.Add(regionInfo); 83 regionInfos.Add(regionInfo);
83 i++; 84 i++;