Changed RequestRootFolder to GetRootFolder
							parent
							
								
									17cc9b9857
								
							
						
					
					
						commit
						0c47f8e7ab
					
				| 
						 | 
				
			
			@ -265,7 +265,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 | 
			
		|||
 | 
			
		||||
            if (Rest.InventoryServices.HasInventoryForUser(rdata.uuid))
 | 
			
		||||
            {
 | 
			
		||||
                rdata.root = Rest.InventoryServices.RequestRootFolder(rdata.uuid);
 | 
			
		||||
                rdata.root = Rest.InventoryServices.GetRootFolder(rdata.uuid);
 | 
			
		||||
 | 
			
		||||
                Rest.Log.DebugFormat("{0} Inventory Root retrieved for {1} {2}",
 | 
			
		||||
                                     MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -552,7 +552,7 @@ namespace OpenSim.Framework.Communications.Tests
 | 
			
		|||
            return false;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public InventoryFolderBase RequestRootFolder(UUID userID)
 | 
			
		||||
        public InventoryFolderBase GetRootFolder(UUID userID)
 | 
			
		||||
        {
 | 
			
		||||
            InventoryFolderBase root = new InventoryFolderBase();
 | 
			
		||||
            root.ID = UUID.Random();
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -694,7 +694,7 @@ 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.RequestRootFolder(userProf.ID);
 | 
			
		||||
                    InventoryFolderBase rootfolder = m_InventoryService.GetRootFolder(userProf.ID);
 | 
			
		||||
                    if (rootfolder != null)
 | 
			
		||||
                        userProf.RootInventoryFolderID = rootfolder.ID;
 | 
			
		||||
                }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -346,7 +346,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 | 
			
		|||
            return false;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public InventoryFolderBase RequestRootFolder(UUID userID)
 | 
			
		||||
        public InventoryFolderBase GetRootFolder(UUID userID)
 | 
			
		||||
        {
 | 
			
		||||
            return null;
 | 
			
		||||
        }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -276,9 +276,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 | 
			
		|||
        /// </summary>
 | 
			
		||||
        /// <param name="userID"></param>
 | 
			
		||||
        /// <returns>null if no root folder was found</returns>
 | 
			
		||||
        public InventoryFolderBase RequestRootFolder(UUID userID)
 | 
			
		||||
        public InventoryFolderBase GetRootFolder(UUID userID)
 | 
			
		||||
        {
 | 
			
		||||
            return m_InventoryService.RequestRootFolder(userID);
 | 
			
		||||
            return m_InventoryService.GetRootFolder(userID);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public List<InventoryItemBase> GetActiveGestures(UUID userId)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -259,7 +259,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 | 
			
		|||
            return false;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public InventoryFolderBase RequestRootFolder(UUID userID)
 | 
			
		||||
        public InventoryFolderBase GetRootFolder(UUID userID)
 | 
			
		||||
        {
 | 
			
		||||
            return null;
 | 
			
		||||
        }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -161,7 +161,7 @@ namespace OpenSim.Services.Connectors
 | 
			
		|||
            return false;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        public InventoryFolderBase RequestRootFolder(UUID userID)
 | 
			
		||||
        public InventoryFolderBase GetRootFolder(UUID userID)
 | 
			
		||||
        {
 | 
			
		||||
            return null;
 | 
			
		||||
        }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -142,7 +142,7 @@ namespace OpenSim.Services.Interfaces
 | 
			
		|||
        /// </summary>
 | 
			
		||||
        /// <param name="userID"></param>
 | 
			
		||||
        /// <returns>null if no root folder was found</returns>
 | 
			
		||||
        InventoryFolderBase RequestRootFolder(UUID userID);
 | 
			
		||||
        InventoryFolderBase GetRootFolder(UUID userID);
 | 
			
		||||
 | 
			
		||||
        /// <summary>
 | 
			
		||||
        /// Get the active gestures of the agent.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -60,7 +60,7 @@ namespace OpenSim.Services.InventoryService
 | 
			
		|||
        {
 | 
			
		||||
            m_log.DebugFormat("[INVENTORY SERVICE]: Getting inventory skeleton for {0}", userId);
 | 
			
		||||
 | 
			
		||||
            InventoryFolderBase rootFolder = RequestRootFolder(userId);
 | 
			
		||||
            InventoryFolderBase rootFolder = GetRootFolder(userId);
 | 
			
		||||
 | 
			
		||||
            // Agent has no inventory structure yet.
 | 
			
		||||
            if (null == rootFolder)
 | 
			
		||||
| 
						 | 
				
			
			@ -86,7 +86,7 @@ namespace OpenSim.Services.InventoryService
 | 
			
		|||
        }
 | 
			
		||||
 | 
			
		||||
        // See IInventoryServices
 | 
			
		||||
        public virtual InventoryFolderBase RequestRootFolder(UUID userID)
 | 
			
		||||
        public virtual InventoryFolderBase GetRootFolder(UUID userID)
 | 
			
		||||
        {
 | 
			
		||||
            // Retrieve the first root folder we get from the DB.
 | 
			
		||||
            InventoryFolderBase rootFolder = m_Database.getUserRootFolder(userID);
 | 
			
		||||
| 
						 | 
				
			
			@ -100,7 +100,7 @@ namespace OpenSim.Services.InventoryService
 | 
			
		|||
        // See IInventoryServices
 | 
			
		||||
        public bool CreateUserInventory(UUID user)
 | 
			
		||||
        {
 | 
			
		||||
            InventoryFolderBase existingRootFolder = RequestRootFolder(user);
 | 
			
		||||
            InventoryFolderBase existingRootFolder = GetRootFolder(user);
 | 
			
		||||
 | 
			
		||||
            if (null != existingRootFolder)
 | 
			
		||||
            {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue