Merge branch 'master' into careminster

3 files changed, 0 insertions, 13 deletions

diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs
index b652299..57ca704 100644
--- a/OpenSim/Framework/Communications/Services/LoginService.cs
+++ b/OpenSim/Framework/Communications/Services/LoginService.cs
@@ -244,7 +244,6 @@ namespace OpenSim.Framework.Communications.Services
                             InventoryRootHash["folder_id"] = inventData.RootFolderID.ToString();
                             ArrayList InventoryRoot = new ArrayList();
                             InventoryRoot.Add(InventoryRootHash);
-                            userProfile.RootInventoryFolderID = inventData.RootFolderID;
 
                             logResponse.InventoryRoot = InventoryRoot;
                             logResponse.InventorySkeleton = AgentInventoryArray;
@@ -501,7 +500,6 @@ namespace OpenSim.Framework.Communications.Services
                         InventoryRootHash["folder_id"] = inventData.RootFolderID.ToString();
                         ArrayList InventoryRoot = new ArrayList();
                         InventoryRoot.Add(InventoryRootHash);
-                        userProfile.RootInventoryFolderID = inventData.RootFolderID;
 
 
                         // Inventory Library Section
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index bf4f331..4f0af06 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -697,9 +697,6 @@ namespace OpenSim.Framework.Communications
                     // local service (standalone)
                     m_log.Debug("[USERSTORAGE]: using IInventoryService to create user's inventory");
                     m_InventoryService.CreateUserInventory(userProf.ID);
-                    InventoryFolderBase rootfolder = m_InventoryService.GetRootFolder(userProf.ID);
-                    if (rootfolder != null)
-                        userProf.RootInventoryFolderID = rootfolder.ID;
                 }
                 else if (m_commsManager.InterServiceInventoryService != null)
                 {
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index 413f152..9bac739 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -119,8 +119,6 @@ namespace OpenSim.Framework
         /// </summary>
         private string m_profileUrl;
 
-        private UUID m_rootInventoryFolderId;
-
         /// <summary>
         /// The second component of a users account name
         /// </summary>
@@ -312,12 +310,6 @@ namespace OpenSim.Framework
             set { m_lastLogin = value; }
         }
 
-        public UUID RootInventoryFolderID
-        {
-            get { return m_rootInventoryFolderId; }
-            set { m_rootInventoryFolderId = value; }
-        }
-
         public string UserInventoryURI
         {
             get { return m_userInventoryUri; }