diff options
| author | Dan Lake | 2012-05-10 14:43:02 -0700 |
|---|---|---|
| committer | Dan Lake | 2012-05-10 14:43:02 -0700 |
| commit | 117c183fde5c21bd87c99cb0af4c1903550570e9 (patch) | |
| tree | d109468b072ec15d8a6afee384185aab3439b056 /OpenSim/Server/Base | |
| parent | Add even for terrain tainting and synchronize terrain module with physics sce... (diff) | |
| parent | Saving estate state is really slow (relatively) and it gets (diff) | |
| download | opensim-SC-117c183fde5c21bd87c99cb0af4c1903550570e9.zip opensim-SC-117c183fde5c21bd87c99cb0af4c1903550570e9.tar.gz opensim-SC-117c183fde5c21bd87c99cb0af4c1903550570e9.tar.bz2 opensim-SC-117c183fde5c21bd87c99cb0af4c1903550570e9.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Server/Base')
| -rw-r--r-- | OpenSim/Server/Base/ServerUtils.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs index 0cc2a4b..42c82cf 100644 --- a/OpenSim/Server/Base/ServerUtils.cs +++ b/OpenSim/Server/Base/ServerUtils.cs | |||
| @@ -268,7 +268,7 @@ namespace OpenSim.Server.Base | |||
| 268 | continue; | 268 | continue; |
| 269 | 269 | ||
| 270 | XmlElement elem = parent.OwnerDocument.CreateElement("", | 270 | XmlElement elem = parent.OwnerDocument.CreateElement("", |
| 271 | kvp.Key, ""); | 271 | XmlConvert.EncodeLocalName(kvp.Key), ""); |
| 272 | 272 | ||
| 273 | if (kvp.Value is Dictionary<string, object>) | 273 | if (kvp.Value is Dictionary<string, object>) |
| 274 | { | 274 | { |
| @@ -323,11 +323,11 @@ namespace OpenSim.Server.Base | |||
| 323 | XmlNode type = part.Attributes.GetNamedItem("type"); | 323 | XmlNode type = part.Attributes.GetNamedItem("type"); |
| 324 | if (type == null || type.Value != "List") | 324 | if (type == null || type.Value != "List") |
| 325 | { | 325 | { |
| 326 | ret[part.Name] = part.InnerText; | 326 | ret[XmlConvert.DecodeName(part.Name)] = part.InnerText; |
| 327 | } | 327 | } |
| 328 | else | 328 | else |
| 329 | { | 329 | { |
| 330 | ret[part.Name] = ParseElement(part); | 330 | ret[XmlConvert.DecodeName(part.Name)] = ParseElement(part); |
| 331 | } | 331 | } |
| 332 | } | 332 | } |
| 333 | 333 | ||