diff options
Diffstat (limited to 'OpenSim/Services/HypergridService/HGAssetService.cs')
-rw-r--r-- | OpenSim/Services/HypergridService/HGAssetService.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Services/HypergridService/HGAssetService.cs b/OpenSim/Services/HypergridService/HGAssetService.cs index e518329..22e233a 100644 --- a/OpenSim/Services/HypergridService/HGAssetService.cs +++ b/OpenSim/Services/HypergridService/HGAssetService.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Services.HypergridService | |||
53 | LogManager.GetLogger( | 53 | LogManager.GetLogger( |
54 | MethodBase.GetCurrentMethod().DeclaringType); | 54 | MethodBase.GetCurrentMethod().DeclaringType); |
55 | 55 | ||
56 | private string m_ProfileServiceURL; | 56 | private string m_HomeURL; |
57 | private IUserAccountService m_UserAccountService; | 57 | private IUserAccountService m_UserAccountService; |
58 | 58 | ||
59 | private UserAccountCache m_Cache; | 59 | private UserAccountCache m_Cache; |
@@ -74,7 +74,10 @@ namespace OpenSim.Services.HypergridService | |||
74 | if (m_UserAccountService == null) | 74 | if (m_UserAccountService == null) |
75 | throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll)); | 75 | throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll)); |
76 | 76 | ||
77 | m_ProfileServiceURL = assetConfig.GetString("ProfileServerURI", string.Empty); | 77 | // legacy configuration [obsolete] |
78 | m_HomeURL = assetConfig.GetString("ProfileServerURI", string.Empty); | ||
79 | // Preferred | ||
80 | m_HomeURL = assetConfig.GetString("HomeURI", m_HomeURL); | ||
78 | 81 | ||
79 | m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); | 82 | m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); |
80 | } | 83 | } |
@@ -134,13 +137,13 @@ namespace OpenSim.Services.HypergridService | |||
134 | 137 | ||
135 | UserAccount creator = m_Cache.GetUser(meta.CreatorID); | 138 | UserAccount creator = m_Cache.GetUser(meta.CreatorID); |
136 | if (creator != null) | 139 | if (creator != null) |
137 | meta.CreatorID = m_ProfileServiceURL + "/" + meta.CreatorID + ";" + creator.FirstName + " " + creator.LastName; | 140 | meta.CreatorID = meta.CreatorID + ";" + m_HomeURL + "/" + creator.FirstName + " " + creator.LastName; |
138 | } | 141 | } |
139 | 142 | ||
140 | protected byte[] AdjustIdentifiers(byte[] data) | 143 | protected byte[] AdjustIdentifiers(byte[] data) |
141 | { | 144 | { |
142 | string xml = Utils.BytesToString(data); | 145 | string xml = Utils.BytesToString(data); |
143 | return Utils.StringToBytes(ExternalRepresentationUtils.RewriteSOP(xml, m_ProfileServiceURL, m_Cache, UUID.Zero)); | 146 | return Utils.StringToBytes(ExternalRepresentationUtils.RewriteSOP(xml, m_HomeURL, m_Cache, UUID.Zero)); |
144 | } | 147 | } |
145 | 148 | ||
146 | } | 149 | } |