OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed RequestRootFolder to GetRootFolder

arthursv
Diva Canto 2009-08-10 16:02:09 -07:00
parent 17cc9b9857
commit 0c47f8e7ab
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
View File

@ -265,7 +265,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
if (Rest.InventoryServices.HasInventoryForUser(rdata.uuid)) 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}", Rest.Log.DebugFormat("{0} Inventory Root retrieved for {1} {2}",
MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName); MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName);

2
OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
View File

@ -552,7 +552,7 @@ namespace OpenSim.Framework.Communications.Tests
return false; return false;
} }
public InventoryFolderBase RequestRootFolder(UUID userID) public InventoryFolderBase GetRootFolder(UUID userID)
{ {
InventoryFolderBase root = new InventoryFolderBase(); InventoryFolderBase root = new InventoryFolderBase();
root.ID = UUID.Random(); root.ID = UUID.Random();

2
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@ -694,7 +694,7 @@ namespace OpenSim.Framework.Communications
// local service (standalone) // local service (standalone)
m_log.Debug("[USERSTORAGE]: using IInventoryService to create user's inventory"); m_log.Debug("[USERSTORAGE]: using IInventoryService to create user's inventory");
m_InventoryService.CreateUserInventory(userProf.ID); m_InventoryService.CreateUserInventory(userProf.ID);
InventoryFolderBase rootfolder = m_InventoryService.RequestRootFolder(userProf.ID); InventoryFolderBase rootfolder = m_InventoryService.GetRootFolder(userProf.ID);
if (rootfolder != null) if (rootfolder != null)
userProf.RootInventoryFolderID = rootfolder.ID; userProf.RootInventoryFolderID = rootfolder.ID;
} }

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
View File

@ -346,7 +346,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
return false; return false;
} }
public InventoryFolderBase RequestRootFolder(UUID userID) public InventoryFolderBase GetRootFolder(UUID userID)
{ {
return null; return null;
} }

4
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
View File

@ -276,9 +276,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
/// </summary> /// </summary>
/// <param name="userID"></param> /// <param name="userID"></param>
/// <returns>null if no root folder was found</returns> /// <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) public List<InventoryItemBase> GetActiveGestures(UUID userId)

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
View File

@ -259,7 +259,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
return false; return false;
} }
public InventoryFolderBase RequestRootFolder(UUID userID) public InventoryFolderBase GetRootFolder(UUID userID)
{ {
return null; return null;
} }

2
OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
View File

@ -161,7 +161,7 @@ namespace OpenSim.Services.Connectors
return false; return false;
} }
public InventoryFolderBase RequestRootFolder(UUID userID) public InventoryFolderBase GetRootFolder(UUID userID)
{ {
return null; return null;
} }

2
OpenSim/Services/Interfaces/IInventoryService.cs
View File

@ -142,7 +142,7 @@ namespace OpenSim.Services.Interfaces
/// </summary> /// </summary>
/// <param name="userID"></param> /// <param name="userID"></param>
/// <returns>null if no root folder was found</returns> /// <returns>null if no root folder was found</returns>
InventoryFolderBase RequestRootFolder(UUID userID); InventoryFolderBase GetRootFolder(UUID userID);
/// <summary> /// <summary>
/// Get the active gestures of the agent. /// Get the active gestures of the agent.

6
OpenSim/Services/InventoryService/InventoryService.cs
View File

@ -60,7 +60,7 @@ namespace OpenSim.Services.InventoryService
{ {
m_log.DebugFormat("[INVENTORY SERVICE]: Getting inventory skeleton for {0}", userId); 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. // Agent has no inventory structure yet.
if (null == rootFolder) if (null == rootFolder)
@ -86,7 +86,7 @@ namespace OpenSim.Services.InventoryService
} }
// See IInventoryServices // See IInventoryServices
public virtual InventoryFolderBase RequestRootFolder(UUID userID) public virtual InventoryFolderBase GetRootFolder(UUID userID)
{ {
// Retrieve the first root folder we get from the DB. // Retrieve the first root folder we get from the DB.
InventoryFolderBase rootFolder = m_Database.getUserRootFolder(userID); InventoryFolderBase rootFolder = m_Database.getUserRootFolder(userID);
@ -100,7 +100,7 @@ namespace OpenSim.Services.InventoryService
// See IInventoryServices // See IInventoryServices
public bool CreateUserInventory(UUID user) public bool CreateUserInventory(UUID user)
{ {
InventoryFolderBase existingRootFolder = RequestRootFolder(user); InventoryFolderBase existingRootFolder = GetRootFolder(user);
if (null != existingRootFolder) if (null != existingRootFolder)
{ {