aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorDiva Canto2009-08-10 16:02:09 -0700
committerDiva Canto2009-08-10 16:02:09 -0700
commit0c47f8e7ab1a1c28de218a3338143038ccaaa4a4 (patch)
tree02d966e07c23807b47f9f079260ea1d2b21f57a3 /OpenSim/Services
parentLast piece of cleaning up old inventory. Old IInventoryServices and ISecureIn... (diff)
downloadopensim-SC_OLD-0c47f8e7ab1a1c28de218a3338143038ccaaa4a4.zip
opensim-SC_OLD-0c47f8e7ab1a1c28de218a3338143038ccaaa4a4.tar.gz
opensim-SC_OLD-0c47f8e7ab1a1c28de218a3338143038ccaaa4a4.tar.bz2
opensim-SC_OLD-0c47f8e7ab1a1c28de218a3338143038ccaaa4a4.tar.xz
Changed RequestRootFolder to GetRootFolder
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs2
-rw-r--r--OpenSim/Services/Interfaces/IInventoryService.cs2
-rw-r--r--OpenSim/Services/InventoryService/InventoryService.cs6
3 files changed, 5 insertions, 5 deletions
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 {