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/Services/HypergridService/HGInventoryService.cs | |
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_OLD-0a1d61950b326abffbcc0b9fe763e1cc6351acf6.zip opensim-SC_OLD-0a1d61950b326abffbcc0b9fe763e1cc6351acf6.tar.gz opensim-SC_OLD-0a1d61950b326abffbcc0b9fe763e1cc6351acf6.tar.bz2 opensim-SC_OLD-0a1d61950b326abffbcc0b9fe763e1cc6351acf6.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/HypergridService/HGInventoryService.cs')
-rw-r--r-- | OpenSim/Services/HypergridService/HGInventoryService.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs index 4eb61ba..daf8c3a 100644 --- a/OpenSim/Services/HypergridService/HGInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGInventoryService.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Services.HypergridService | |||
55 | 55 | ||
56 | protected new IXInventoryData m_Database; | 56 | protected new IXInventoryData m_Database; |
57 | 57 | ||
58 | private string m_ProfileServiceURL; | 58 | private string m_HomeURL; |
59 | private IUserAccountService m_UserAccountService; | 59 | private IUserAccountService m_UserAccountService; |
60 | 60 | ||
61 | private UserAccountCache m_Cache; | 61 | private UserAccountCache m_Cache; |
@@ -100,7 +100,10 @@ namespace OpenSim.Services.HypergridService | |||
100 | if (m_UserAccountService == null) | 100 | if (m_UserAccountService == null) |
101 | throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll)); | 101 | throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll)); |
102 | 102 | ||
103 | m_ProfileServiceURL = invConfig.GetString("ProfileServerURI", string.Empty); | 103 | // legacy configuration [obsolete] |
104 | m_HomeURL = invConfig.GetString("ProfileServerURI", string.Empty); | ||
105 | // Preferred | ||
106 | m_HomeURL = invConfig.GetString("HomeURI", m_HomeURL); | ||
104 | 107 | ||
105 | m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); | 108 | m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); |
106 | } | 109 | } |
@@ -321,7 +324,7 @@ namespace OpenSim.Services.HypergridService | |||
321 | 324 | ||
322 | // Adjust the creator data | 325 | // Adjust the creator data |
323 | if (user != null && it != null && (it.CreatorData == null || it.CreatorData == string.Empty)) | 326 | if (user != null && it != null && (it.CreatorData == null || it.CreatorData == string.Empty)) |
324 | it.CreatorData = m_ProfileServiceURL + "/" + it.CreatorId + ";" + user.FirstName + " " + user.LastName; | 327 | it.CreatorData = m_HomeURL + ";" + user.FirstName + " " + user.LastName; |
325 | 328 | ||
326 | return it; | 329 | return it; |
327 | } | 330 | } |