diff options
author | Justin Clark-Casey (justincc) | 2014-03-25 00:20:38 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-03-25 00:20:38 +0000 |
commit | 091f3a80008a0f4a756fcb9ff4e87a24c2948c3c (patch) | |
tree | a98354e9317e0ed6892dec344a69447c0e9c70b8 /OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs | |
parent | Don't fail to enable permissions modules correctly if there is any leading or... (diff) | |
parent | Fixed Debug command for Groups. (Use of wrong capitalization caused *two* "de... (diff) | |
download | opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.zip opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.gz opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.bz2 opensim-SC_OLD-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs')
-rw-r--r-- | OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs index c56f213..db46ea8 100644 --- a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs +++ b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | * | 4 | * |
@@ -161,7 +161,7 @@ namespace OpenSim.Framework.Serialization.External | |||
161 | if (!hasCreatorData && creator != null) | 161 | if (!hasCreatorData && creator != null) |
162 | { | 162 | { |
163 | XmlElement creatorData = doc.CreateElement("CreatorData"); | 163 | XmlElement creatorData = doc.CreateElement("CreatorData"); |
164 | creatorData.InnerText = homeURL + ";" + creator.FirstName + " " + creator.LastName; | 164 | creatorData.InnerText = CalcCreatorData(homeURL, creator.FirstName + " " + creator.LastName); |
165 | sop.AppendChild(creatorData); | 165 | sop.AppendChild(creatorData); |
166 | } | 166 | } |
167 | } | 167 | } |
@@ -172,5 +172,15 @@ namespace OpenSim.Framework.Serialization.External | |||
172 | return wr.ToString(); | 172 | return wr.ToString(); |
173 | } | 173 | } |
174 | } | 174 | } |
175 | |||
176 | public static string CalcCreatorData(string homeURL, string name) | ||
177 | { | ||
178 | return homeURL + ";" + name; | ||
179 | } | ||
180 | |||
181 | internal static string CalcCreatorData(string homeURL, UUID uuid, string name) | ||
182 | { | ||
183 | return homeURL + "/" + uuid + ";" + name; | ||
184 | } | ||
175 | } | 185 | } |
176 | } \ No newline at end of file | 186 | } |