diff options
author | Dan Lake | 2012-02-01 16:25:35 -0800 |
---|---|---|
committer | Dan Lake | 2012-02-01 16:25:35 -0800 |
commit | c10193c72b1f029a958f04d2f5d7ee384e693aaa (patch) | |
tree | 052ec7e973c15b158310511197affad14eb9c64f /OpenSim/Framework/Serialization/External | |
parent | Trigger event when prims are scheduled for an update. This gives modules earl... (diff) | |
parent | Small optimization to last commit (diff) | |
download | opensim-SC_OLD-c10193c72b1f029a958f04d2f5d7ee384e693aaa.zip opensim-SC_OLD-c10193c72b1f029a958f04d2f5d7ee384e693aaa.tar.gz opensim-SC_OLD-c10193c72b1f029a958f04d2f5d7ee384e693aaa.tar.bz2 opensim-SC_OLD-c10193c72b1f029a958f04d2f5d7ee384e693aaa.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/Serialization/External')
-rw-r--r-- | OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs index 6e8c2ee..7447ac2 100644 --- a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs +++ b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs | |||
@@ -44,13 +44,13 @@ namespace OpenSim.Framework.Serialization.External | |||
44 | /// with creator data added to it. | 44 | /// with creator data added to it. |
45 | /// </summary> | 45 | /// </summary> |
46 | /// <param name="xml">The SceneObjectPart represented in XML2</param> | 46 | /// <param name="xml">The SceneObjectPart represented in XML2</param> |
47 | /// <param name="profileURL">The URL of the profile service for the creator</param> | 47 | /// <param name="homeURL">The URL of the user agents service (home) for the creator</param> |
48 | /// <param name="userService">The service for retrieving user account information</param> | 48 | /// <param name="userService">The service for retrieving user account information</param> |
49 | /// <param name="scopeID">The scope of the user account information (Grid ID)</param> | 49 | /// <param name="scopeID">The scope of the user account information (Grid ID)</param> |
50 | /// <returns>The SceneObjectPart represented in XML2</returns> | 50 | /// <returns>The SceneObjectPart represented in XML2</returns> |
51 | public static string RewriteSOP(string xml, string profileURL, IUserAccountService userService, UUID scopeID) | 51 | public static string RewriteSOP(string xml, string homeURL, IUserAccountService userService, UUID scopeID) |
52 | { | 52 | { |
53 | if (xml == string.Empty || profileURL == string.Empty || userService == null) | 53 | if (xml == string.Empty || homeURL == string.Empty || userService == null) |
54 | return xml; | 54 | return xml; |
55 | 55 | ||
56 | XmlDocument doc = new XmlDocument(); | 56 | XmlDocument doc = new XmlDocument(); |
@@ -83,7 +83,7 @@ namespace OpenSim.Framework.Serialization.External | |||
83 | if (!hasCreatorData && creator != null) | 83 | if (!hasCreatorData && creator != null) |
84 | { | 84 | { |
85 | XmlElement creatorData = doc.CreateElement("CreatorData"); | 85 | XmlElement creatorData = doc.CreateElement("CreatorData"); |
86 | creatorData.InnerText = profileURL + "/" + creator.PrincipalID + ";" + creator.FirstName + " " + creator.LastName; | 86 | creatorData.InnerText = homeURL + ";" + creator.FirstName + " " + creator.LastName; |
87 | sop.AppendChild(creatorData); | 87 | sop.AppendChild(creatorData); |
88 | } | 88 | } |
89 | } | 89 | } |