diff options
author | Diva Canto | 2012-01-12 09:56:35 -0800 |
---|---|---|
committer | Diva Canto | 2012-01-12 09:56:35 -0800 |
commit | 8bdd80abfa3830142b16615d97d555dad417e08d (patch) | |
tree | bfeb815776a50535591d2bacd20082c6e7f8caa9 /OpenSim/Framework | |
parent | Correcting ini.example were permissionmodules uses komma instead of space as ... (diff) | |
download | opensim-SC_OLD-8bdd80abfa3830142b16615d97d555dad417e08d.zip opensim-SC_OLD-8bdd80abfa3830142b16615d97d555dad417e08d.tar.gz opensim-SC_OLD-8bdd80abfa3830142b16615d97d555dad417e08d.tar.bz2 opensim-SC_OLD-8bdd80abfa3830142b16615d97d555dad417e08d.tar.xz |
HG: normalize all externalized user ULRs to be the Home URL, i.e. the location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.
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 | } |