aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-09-03 22:38:40 +0100
committerJustin Clark-Casey (justincc)2010-09-03 22:38:40 +0100
commitb8da15c10448993a0bb81e8d1b1a31250515c1eb (patch)
tree55347dc096d139e3a12665ea8bef26f3ede55e4a /OpenSim/Framework/RegionInfo.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-b8da15c10448993a0bb81e8d1b1a31250515c1eb.zip
opensim-SC_OLD-b8da15c10448993a0bb81e8d1b1a31250515c1eb.tar.gz
opensim-SC_OLD-b8da15c10448993a0bb81e8d1b1a31250515c1eb.tar.bz2
opensim-SC_OLD-b8da15c10448993a0bb81e8d1b1a31250515c1eb.tar.xz
In RemoveAdminPlugin, use a .ini file template in XmlRpcCreateRegionMethod rather than an older XML one
This is a patch from http://opensimulator.org/mantis/view.php?id=4973. Thanks randomhuman
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r--OpenSim/Framework/RegionInfo.cs15
1 files changed, 10 insertions, 5 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index ea1a594..12c58c3 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -805,7 +805,7 @@ namespace OpenSim.Framework
805 IConfig config = source.Configs[RegionName]; 805 IConfig config = source.Configs[RegionName];
806 806
807 if (config != null) 807 if (config != null)
808 source.Configs.Remove(RegionName); 808 source.Configs.Remove(config);
809 809
810 config = source.AddConfig(RegionName); 810 config = source.AddConfig(RegionName);
811 811
@@ -864,10 +864,15 @@ namespace OpenSim.Framework
864 864
865 return; 865 return;
866 } 866 }
867 configMember = new ConfigurationMember(filename, description, loadConfigurationOptionsFromMe, 867 else if (filename.ToLower().EndsWith(".xml"))
868 ignoreIncomingConfiguration, false); 868 {
869 configMember.performConfigurationRetrieve(); 869 configMember = new ConfigurationMember(filename, description, loadConfigurationOptionsFromMe,
870 RegionFile = filename; 870 ignoreIncomingConfiguration, false);
871 configMember.performConfigurationRetrieve();
872 RegionFile = filename;
873 }
874 else
875 throw new Exception("Invalid file type for region persistence.");
871 } 876 }
872 877
873 public void loadConfigurationOptionsFromMe() 878 public void loadConfigurationOptionsFromMe()