Reverting back to 2017 since 2018 were causing Linux breakage; reopening Tleiades patch 444 and 445.

1 files changed, 5 insertions, 9 deletions

diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index 9e8c239..99dc45a 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -38,7 +38,7 @@ using OpenSim.Framework.Utilities;
 
 namespace OpenSim.Framework.Communications.Caches
 {
-    public class CachedUserInfo : MarshalByRefObject
+    public class CachedUserInfo
     {
         private CommunicationsManager m_parentCommsManager;
         // Fields
@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Communications.Caches
         }
 
         // Methods
-        public void FolderReceive(LLUUID userID, InventoryFolderBase folderInfo)
+        public void FolderReceive(LLUUID userID, InventoryFolder folderInfo)
         {
             if (userID == this.UserProfile.UUID)
             {
@@ -59,19 +59,19 @@ namespace OpenSim.Framework.Communications.Caches
                 {
                     if (folderInfo.parentID == LLUUID.Zero)
                     {
-                        this.RootFolder = new InventoryFolder(folderInfo);
+                        this.RootFolder = folderInfo;
                     }
                 }
                 else if (this.RootFolder.folderID == folderInfo.parentID)
                 {
-                    this.RootFolder.SubFolders.Add(folderInfo.folderID, new InventoryFolder(folderInfo));
+                    this.RootFolder.SubFolders.Add(folderInfo.folderID, folderInfo);
                 }
                 else
                 {
                     InventoryFolder folder = this.RootFolder.HasSubFolder(folderInfo.parentID);
                     if (folder != null)
                     {
-                        folder.SubFolders.Add(folderInfo.folderID, new InventoryFolder(folderInfo));
+                        folder.SubFolders.Add(folderInfo.folderID, folderInfo);
                     }
                 }
             }
@@ -131,7 +131,3 @@ namespace OpenSim.Framework.Communications.Caches
 
 }
 
-
-
-
-