diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Services/HypergridService/HGInventoryService.cs | |
parent | Add a build script. (diff) | |
download | opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to 'OpenSim/Services/HypergridService/HGInventoryService.cs')
-rw-r--r-- | OpenSim/Services/HypergridService/HGInventoryService.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs index 9158b41..f14593e 100644 --- a/OpenSim/Services/HypergridService/HGInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGInventoryService.cs | |||
@@ -70,7 +70,7 @@ namespace OpenSim.Services.HypergridService | |||
70 | // | 70 | // |
71 | IConfig invConfig = config.Configs[m_ConfigName]; | 71 | IConfig invConfig = config.Configs[m_ConfigName]; |
72 | if (invConfig != null) | 72 | if (invConfig != null) |
73 | { | 73 | { |
74 | // realm = authConfig.GetString("Realm", realm); | 74 | // realm = authConfig.GetString("Realm", realm); |
75 | string userAccountsDll = invConfig.GetString("UserAccountsService", string.Empty); | 75 | string userAccountsDll = invConfig.GetString("UserAccountsService", string.Empty); |
76 | if (userAccountsDll == string.Empty) | 76 | if (userAccountsDll == string.Empty) |
@@ -82,7 +82,7 @@ namespace OpenSim.Services.HypergridService | |||
82 | throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll)); | 82 | throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll)); |
83 | 83 | ||
84 | m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI", | 84 | m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI", |
85 | new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty); | 85 | new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty); |
86 | 86 | ||
87 | m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); | 87 | m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService); |
88 | } | 88 | } |
@@ -113,7 +113,7 @@ namespace OpenSim.Services.HypergridService | |||
113 | 113 | ||
114 | if (folders.Length > 0) | 114 | if (folders.Length > 0) |
115 | return ConvertToOpenSim(folders[0]); | 115 | return ConvertToOpenSim(folders[0]); |
116 | 116 | ||
117 | // make one | 117 | // make one |
118 | XInventoryFolder suitcase = CreateFolder(principalID, UUID.Zero, (int)FolderType.Suitcase, "My Suitcase"); | 118 | XInventoryFolder suitcase = CreateFolder(principalID, UUID.Zero, (int)FolderType.Suitcase, "My Suitcase"); |
119 | return ConvertToOpenSim(suitcase); | 119 | return ConvertToOpenSim(suitcase); |
@@ -160,7 +160,7 @@ namespace OpenSim.Services.HypergridService | |||
160 | { | 160 | { |
161 | return new InventoryCollection[0]; | 161 | return new InventoryCollection[0]; |
162 | } | 162 | } |
163 | 163 | ||
164 | //public List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID) | 164 | //public List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID) |
165 | //{ | 165 | //{ |
166 | //} | 166 | //} |
@@ -291,9 +291,9 @@ namespace OpenSim.Services.HypergridService | |||
291 | //{ | 291 | //{ |
292 | //} | 292 | //} |
293 | 293 | ||
294 | public override InventoryItemBase GetItem(InventoryItemBase item) | 294 | public override InventoryItemBase GetItem(UUID principalID, UUID itemID) |
295 | { | 295 | { |
296 | InventoryItemBase it = base.GetItem(item); | 296 | InventoryItemBase it = base.GetItem(principalID, itemID); |
297 | if (it != null) | 297 | if (it != null) |
298 | { | 298 | { |
299 | UserAccount user = m_Cache.GetUser(it.CreatorId); | 299 | UserAccount user = m_Cache.GetUser(it.CreatorId); |