diff options
| author | Justin Clarke Casey | 2008-08-09 19:51:49 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-08-09 19:51:49 +0000 |
| commit | a78e5ea14249590aa0197728034d10c3742e800a (patch) | |
| tree | 9631c860e7ea78fd56212b18ceaadb99c6fd5fd1 | |
| parent | * Added a little more log info in LLUDPServer (diff) | |
| download | opensim-SC-a78e5ea14249590aa0197728034d10c3742e800a.zip opensim-SC-a78e5ea14249590aa0197728034d10c3742e800a.tar.gz opensim-SC-a78e5ea14249590aa0197728034d10c3742e800a.tar.bz2 opensim-SC-a78e5ea14249590aa0197728034d10c3742e800a.tar.xz | |
* Change _Config.xml node selection code to allow comments
| -rw-r--r-- | OpenSim/Framework/Configuration/XML/XmlConfiguration.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs index 0a9f751..2154e1e 100644 --- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs +++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs | |||
| @@ -46,13 +46,13 @@ namespace OpenSim.Framework.Configuration.XML | |||
| 46 | 46 | ||
| 47 | private void LoadDataToClass() | 47 | private void LoadDataToClass() |
| 48 | { | 48 | { |
| 49 | rootNode = doc.FirstChild; | 49 | rootNode = doc.SelectSingleNode("Root"); |
| 50 | if (rootNode.Name != "Root") | 50 | if (null == rootNode) |
| 51 | throw new Exception("Error: Invalid .xml File. Missing <Root>"); | 51 | throw new Exception("Error: Invalid .xml File. Missing <Root>"); |
| 52 | 52 | ||
| 53 | configNode = rootNode.FirstChild; | 53 | configNode = rootNode.SelectSingleNode("Config"); |
| 54 | if (configNode.Name != "Config") | 54 | if (null == configNode) |
| 55 | throw new Exception("Error: Invalid .xml File. <Root> first child should be <Config>"); | 55 | throw new Exception("Error: Invalid .xml File. <Root> should contain a <Config>"); |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | public void LoadData() | 58 | public void LoadData() |