2 files changed, 34 insertions, 2 deletions

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index eb10fac..504b303 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -259,6 +259,8 @@ namespace OpenSim.Framework
 
                     newFile.Save(filename);
 
+                    RegionFile = filename;
+
                     return;
                 }
 
@@ -273,6 +275,8 @@ namespace OpenSim.Framework
                 if (configName != String.Empty && saveFile)
                     source.Save(filename);
 
+                RegionFile = filename;
+
                 return;
             }
 
@@ -285,6 +289,8 @@ namespace OpenSim.Framework
 
                 ReadNiniConfig(xmlsource, configName);
 
+                RegionFile = filename;
+
                 return;
             }
             catch (Exception)
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 1ff53c9..9e3dafb 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -465,8 +465,34 @@ namespace OpenSim
 
             if (!String.IsNullOrEmpty(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(".xml"))
+                {
+                    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)
+                    {
+                    }
+                }
             }
         }