From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001
From: onefang
Date: Sun, 19 May 2019 21:24:15 +1000
Subject: Dump OpenSim 0.9.0.1 into it's own branch.

---
 OpenSim/Services/HypergridService/HGInventoryService.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Services/HypergridService/HGInventoryService.cs')

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
             //
             IConfig invConfig = config.Configs[m_ConfigName];
             if (invConfig != null)
-            {                
+            {
                 // realm = authConfig.GetString("Realm", realm);
                 string userAccountsDll = invConfig.GetString("UserAccountsService", string.Empty);
                 if (userAccountsDll == string.Empty)
@@ -82,7 +82,7 @@ namespace OpenSim.Services.HypergridService
                     throw new Exception(String.Format("Unable to create UserAccountService from {0}", userAccountsDll));
 
                 m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI",
-                    new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty); 
+                    new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty);
 
                 m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
             }
@@ -113,7 +113,7 @@ namespace OpenSim.Services.HypergridService
 
             if (folders.Length > 0)
                 return ConvertToOpenSim(folders[0]);
-            
+
             // make one
             XInventoryFolder suitcase = CreateFolder(principalID, UUID.Zero, (int)FolderType.Suitcase, "My Suitcase");
             return ConvertToOpenSim(suitcase);
@@ -160,7 +160,7 @@ namespace OpenSim.Services.HypergridService
         {
             return new InventoryCollection[0];
         }
-        
+
         //public List<InventoryItemBase> GetFolderItems(UUID principalID, UUID folderID)
         //{
         //}
@@ -291,9 +291,9 @@ namespace OpenSim.Services.HypergridService
         //{
         //}
 
-        public override InventoryItemBase GetItem(InventoryItemBase item)
+        public override InventoryItemBase GetItem(UUID principalID, UUID itemID)
         {
-            InventoryItemBase it = base.GetItem(item);
+            InventoryItemBase it = base.GetItem(principalID, itemID);
             if (it != null)
             {
                 UserAccount user = m_Cache.GetUser(it.CreatorId);
-- 
cgit v1.1