diff options
Diffstat (limited to 'OpenSim')
9 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs index a1cd116..aec06be 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | |||
@@ -265,7 +265,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
265 | 265 | ||
266 | if (Rest.InventoryServices.HasInventoryForUser(rdata.uuid)) | 266 | if (Rest.InventoryServices.HasInventoryForUser(rdata.uuid)) |
267 | { | 267 | { |
268 | rdata.root = Rest.InventoryServices.RequestRootFolder(rdata.uuid); | 268 | rdata.root = Rest.InventoryServices.GetRootFolder(rdata.uuid); |
269 | 269 | ||
270 | Rest.Log.DebugFormat("{0} Inventory Root retrieved for {1} {2}", | 270 | Rest.Log.DebugFormat("{0} Inventory Root retrieved for {1} {2}", |
271 | MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName); | 271 | MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName); |
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs index 47e0293..373d7cf 100644 --- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs | |||
@@ -552,7 +552,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
552 | return false; | 552 | return false; |
553 | } | 553 | } |
554 | 554 | ||
555 | public InventoryFolderBase RequestRootFolder(UUID userID) | 555 | public InventoryFolderBase GetRootFolder(UUID userID) |
556 | { | 556 | { |
557 | InventoryFolderBase root = new InventoryFolderBase(); | 557 | InventoryFolderBase root = new InventoryFolderBase(); |
558 | root.ID = UUID.Random(); | 558 | root.ID = UUID.Random(); |
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index bd5d0e3..58174a0 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -694,7 +694,7 @@ namespace OpenSim.Framework.Communications | |||
694 | // local service (standalone) | 694 | // local service (standalone) |
695 | m_log.Debug("[USERSTORAGE]: using IInventoryService to create user's inventory"); | 695 | m_log.Debug("[USERSTORAGE]: using IInventoryService to create user's inventory"); |
696 | m_InventoryService.CreateUserInventory(userProf.ID); | 696 | m_InventoryService.CreateUserInventory(userProf.ID); |
697 | InventoryFolderBase rootfolder = m_InventoryService.RequestRootFolder(userProf.ID); | 697 | InventoryFolderBase rootfolder = m_InventoryService.GetRootFolder(userProf.ID); |
698 | if (rootfolder != null) | 698 | if (rootfolder != null) |
699 | userProf.RootInventoryFolderID = rootfolder.ID; | 699 | userProf.RootInventoryFolderID = rootfolder.ID; |
700 | } | 700 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index 1b3d815..16466b0 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 | |||
346 | return false; | 346 | return false; |
347 | } | 347 | } |
348 | 348 | ||
349 | public InventoryFolderBase RequestRootFolder(UUID userID) | 349 | public InventoryFolderBase GetRootFolder(UUID userID) |
350 | { | 350 | { |
351 | return null; | 351 | return null; |
352 | } | 352 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs index e70d985..41a0e43 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 | |||
276 | /// </summary> | 276 | /// </summary> |
277 | /// <param name="userID"></param> | 277 | /// <param name="userID"></param> |
278 | /// <returns>null if no root folder was found</returns> | 278 | /// <returns>null if no root folder was found</returns> |
279 | public InventoryFolderBase RequestRootFolder(UUID userID) | 279 | public InventoryFolderBase GetRootFolder(UUID userID) |
280 | { | 280 | { |
281 | return m_InventoryService.RequestRootFolder(userID); | 281 | return m_InventoryService.GetRootFolder(userID); |
282 | } | 282 | } |
283 | 283 | ||
284 | public List<InventoryItemBase> GetActiveGestures(UUID userId) | 284 | public List<InventoryItemBase> GetActiveGestures(UUID userId) |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs index 31f4032..3f323f1 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 | |||
259 | return false; | 259 | return false; |
260 | } | 260 | } |
261 | 261 | ||
262 | public InventoryFolderBase RequestRootFolder(UUID userID) | 262 | public InventoryFolderBase GetRootFolder(UUID userID) |
263 | { | 263 | { |
264 | return null; | 264 | return null; |
265 | } | 265 | } |
diff --git a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs index 6a93c04..a804973 100644 --- a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs | |||
@@ -161,7 +161,7 @@ namespace OpenSim.Services.Connectors | |||
161 | return false; | 161 | return false; |
162 | } | 162 | } |
163 | 163 | ||
164 | public InventoryFolderBase RequestRootFolder(UUID userID) | 164 | public InventoryFolderBase GetRootFolder(UUID userID) |
165 | { | 165 | { |
166 | return null; | 166 | return null; |
167 | } | 167 | } |
diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs index 15da3cb..733cfd0 100644 --- a/OpenSim/Services/Interfaces/IInventoryService.cs +++ b/OpenSim/Services/Interfaces/IInventoryService.cs | |||
@@ -142,7 +142,7 @@ namespace OpenSim.Services.Interfaces | |||
142 | /// </summary> | 142 | /// </summary> |
143 | /// <param name="userID"></param> | 143 | /// <param name="userID"></param> |
144 | /// <returns>null if no root folder was found</returns> | 144 | /// <returns>null if no root folder was found</returns> |
145 | InventoryFolderBase RequestRootFolder(UUID userID); | 145 | InventoryFolderBase GetRootFolder(UUID userID); |
146 | 146 | ||
147 | /// <summary> | 147 | /// <summary> |
148 | /// Get the active gestures of the agent. | 148 | /// Get the active gestures of the agent. |
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs index ea34195..2b8ee0f 100644 --- a/OpenSim/Services/InventoryService/InventoryService.cs +++ b/OpenSim/Services/InventoryService/InventoryService.cs | |||
@@ -60,7 +60,7 @@ namespace OpenSim.Services.InventoryService | |||
60 | { | 60 | { |
61 | m_log.DebugFormat("[INVENTORY SERVICE]: Getting inventory skeleton for {0}", userId); | 61 | m_log.DebugFormat("[INVENTORY SERVICE]: Getting inventory skeleton for {0}", userId); |
62 | 62 | ||
63 | InventoryFolderBase rootFolder = RequestRootFolder(userId); | 63 | InventoryFolderBase rootFolder = GetRootFolder(userId); |
64 | 64 | ||
65 | // Agent has no inventory structure yet. | 65 | // Agent has no inventory structure yet. |
66 | if (null == rootFolder) | 66 | if (null == rootFolder) |
@@ -86,7 +86,7 @@ namespace OpenSim.Services.InventoryService | |||
86 | } | 86 | } |
87 | 87 | ||
88 | // See IInventoryServices | 88 | // See IInventoryServices |
89 | public virtual InventoryFolderBase RequestRootFolder(UUID userID) | 89 | public virtual InventoryFolderBase GetRootFolder(UUID userID) |
90 | { | 90 | { |
91 | // Retrieve the first root folder we get from the DB. | 91 | // Retrieve the first root folder we get from the DB. |
92 | InventoryFolderBase rootFolder = m_Database.getUserRootFolder(userID); | 92 | InventoryFolderBase rootFolder = m_Database.getUserRootFolder(userID); |
@@ -100,7 +100,7 @@ namespace OpenSim.Services.InventoryService | |||
100 | // See IInventoryServices | 100 | // See IInventoryServices |
101 | public bool CreateUserInventory(UUID user) | 101 | public bool CreateUserInventory(UUID user) |
102 | { | 102 | { |
103 | InventoryFolderBase existingRootFolder = RequestRootFolder(user); | 103 | InventoryFolderBase existingRootFolder = GetRootFolder(user); |
104 | 104 | ||
105 | if (null != existingRootFolder) | 105 | if (null != existingRootFolder) |
106 | { | 106 | { |