From 0c47f8e7ab1a1c28de218a3338143038ccaaa4a4 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 10 Aug 2009 16:02:09 -0700 Subject: [PATCH] Changed RequestRootFolder to GetRootFolder --- .../Rest/Inventory/RestInventoryServices.cs | 2 +- OpenSim/Framework/Communications/Tests/LoginServiceTests.cs | 2 +- OpenSim/Framework/Communications/UserManagerBase.cs | 2 +- .../ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | 2 +- .../Inventory/LocalInventoryServiceConnector.cs | 4 ++-- .../Inventory/RemoteInventoryServiceConnector.cs | 2 +- .../Inventory/QuickAndDirtyInventoryServiceConnector.cs | 2 +- OpenSim/Services/Interfaces/IInventoryService.cs | 2 +- OpenSim/Services/InventoryService/InventoryService.cs | 6 +++--- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs index a1cd116a9b..aec06be6bf 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs @@ -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); diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs index 47e029364e..373d7cf9ef 100644 --- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs @@ -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(); diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index bd5d0e37e3..58174a0dd6 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs @@ -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; } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index 1b3d815225..16466b0b46 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs @@ -346,7 +346,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory return false; } - public InventoryFolderBase RequestRootFolder(UUID userID) + public InventoryFolderBase GetRootFolder(UUID userID) { return null; } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs index e70d985c78..41a0e430d0 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs @@ -276,9 +276,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory /// /// /// null if no root folder was found - public InventoryFolderBase RequestRootFolder(UUID userID) + public InventoryFolderBase GetRootFolder(UUID userID) { - return m_InventoryService.RequestRootFolder(userID); + return m_InventoryService.GetRootFolder(userID); } public List GetActiveGestures(UUID userId) diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs index 31f403240a..3f323f1ca8 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs @@ -259,7 +259,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory return false; } - public InventoryFolderBase RequestRootFolder(UUID userID) + public InventoryFolderBase GetRootFolder(UUID userID) { return null; } diff --git a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs index 6a93c04af0..a804973743 100644 --- a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs @@ -161,7 +161,7 @@ namespace OpenSim.Services.Connectors return false; } - public InventoryFolderBase RequestRootFolder(UUID userID) + public InventoryFolderBase GetRootFolder(UUID userID) { return null; } diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs index 15da3cb3a0..733cfd096e 100644 --- a/OpenSim/Services/Interfaces/IInventoryService.cs +++ b/OpenSim/Services/Interfaces/IInventoryService.cs @@ -142,7 +142,7 @@ namespace OpenSim.Services.Interfaces /// /// /// null if no root folder was found - InventoryFolderBase RequestRootFolder(UUID userID); + InventoryFolderBase GetRootFolder(UUID userID); /// /// Get the active gestures of the agent. diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs index ea3419541c..2b8ee0f3c7 100644 --- a/OpenSim/Services/InventoryService/InventoryService.cs +++ b/OpenSim/Services/InventoryService/InventoryService.cs @@ -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) {