OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make delete-region delete the section from an ini file. Will delete the whole 

file if it has no sections left.
0.6.6-post-fixes
Melanie Thielker 2009-06-26 00:00:20 +00:00
parent 7cc69ac97f
commit 5869598c4c
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/RegionInfo.cs
View File

@ -259,6 +259,8 @@ namespace OpenSim.Framework
newFile.Save(filename); newFile.Save(filename);
RegionFile = filename;
return; return;
} }
@ -273,6 +275,8 @@ namespace OpenSim.Framework
if (configName != String.Empty && saveFile) if (configName != String.Empty && saveFile)
source.Save(filename); source.Save(filename);
RegionFile = filename;
return; return;
} }
@ -285,6 +289,8 @@ namespace OpenSim.Framework
ReadNiniConfig(xmlsource, configName); ReadNiniConfig(xmlsource, configName);
RegionFile = filename;
return; return;
} }
catch (Exception) catch (Exception)

30
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -465,8 +465,34 @@ namespace OpenSim
if (!String.IsNullOrEmpty(scene.RegionInfo.RegionFile)) if (!String.IsNullOrEmpty(scene.RegionInfo.RegionFile))
{ {
File.Delete(scene.RegionInfo.RegionFile); if (scene.RegionInfo.RegionFile.ToLower().EndsWith(".xml"))
m_log.InfoFormat("[OPENSIM]: deleting region file \"{0}\"", scene.RegionInfo.RegionFile); {
File.Delete(scene.RegionInfo.RegionFile);
m_log.InfoFormat("[OPENSIM]: deleting region file \"{0}\"", scene.RegionInfo.RegionFile);
}
if (scene.RegionInfo.RegionFile.ToLower().EndsWith(".ini"))
{
try
{
IniConfigSource source = new IniConfigSource(scene.RegionInfo.RegionFile);
if (source.Configs[scene.RegionInfo.RegionName] != null)
{
source.Configs.Remove(scene.RegionInfo.RegionName);
if (source.Configs.Count == 0)
{
File.Delete(scene.RegionInfo.RegionFile);
}
else
{
source.Save(scene.RegionInfo.RegionFile);
}
}
}
catch (Exception)
{
}
}
} }
} }