diff options
| author | Justin Clark-Casey (justincc) | 2012-01-12 19:03:26 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-01-12 19:03:26 +0000 |
| commit | 0a1d61950b326abffbcc0b9fe763e1cc6351acf6 (patch) | |
| tree | 934c0e80e5103c871fdf19f90ee50e0175d14895 /OpenSim/Framework/Serialization/External | |
| parent | refactor: Move existing npc owner checks to NPCModule.CheckPermissions() meth... (diff) | |
| parent | Renamed one var and deleted commented code. No functional changes. (diff) | |
| download | opensim-SC-0a1d61950b326abffbcc0b9fe763e1cc6351acf6.zip opensim-SC-0a1d61950b326abffbcc0b9fe763e1cc6351acf6.tar.gz opensim-SC-0a1d61950b326abffbcc0b9fe763e1cc6351acf6.tar.bz2 opensim-SC-0a1d61950b326abffbcc0b9fe763e1cc6351acf6.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -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 | } |