ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2012-05-10 00:42:10 +01:00
parent 50321fb7bf d8a78374aa
commit a90822f4b8
24 changed files with 114 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Server/Base/ServerUtils.cs
View File

@@ -268,7 +268,7 @@ namespace OpenSim.Server.Base
continue;
XmlElement elem = parent.OwnerDocument.CreateElement("",
kvp.Key, "");
XmlConvert.EncodeLocalName(kvp.Key), "");
if (kvp.Value is Dictionary<string, object>)
{
@@ -323,11 +323,11 @@ namespace OpenSim.Server.Base
XmlNode type = part.Attributes.GetNamedItem("type");
if (type == null || type.Value != "List")
{
ret[part.Name] = part.InnerText;
ret[XmlConvert.DecodeName(part.Name)] = part.InnerText;
}
else
{
ret[part.Name] = ParseElement(part);
ret[XmlConvert.DecodeName(part.Name)] = ParseElement(part);
}
}