aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-03-28 17:37:55 +0000
committerJustin Clarke Casey2008-03-28 17:37:55 +0000
commit35dec2e53a7e79f7a1cc6db954723ca9769c993b (patch)
tree101438e45da26a4c1d3dde014d67c0c062de4d1b /OpenSim/Framework/Communications
parent* Refactor: Rename CreateInventoryData() to GetInventorySkeleton() (diff)
downloadopensim-SC_OLD-35dec2e53a7e79f7a1cc6db954723ca9769c993b.zip
opensim-SC_OLD-35dec2e53a7e79f7a1cc6db954723ca9769c993b.tar.gz
opensim-SC_OLD-35dec2e53a7e79f7a1cc6db954723ca9769c993b.tar.bz2
opensim-SC_OLD-35dec2e53a7e79f7a1cc6db954723ca9769c993b.tar.xz
* Refactor: Eliminate RequestUsersRoot() redundant method
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs20
1 files changed, 8 insertions, 12 deletions
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 78de4a5..595fa65 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -110,18 +110,9 @@ namespace OpenSim.Framework.Communications
110 } 110 }
111 111
112 // See IInventoryServices 112 // See IInventoryServices
113 public InventoryFolderBase RequestUsersRoot(LLUUID userID)
114 {
115 foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
116 {
117 return plugin.Value.getUserRootFolder(userID);
118 }
119 return null;
120 }
121
122 // See IInventoryServices
123 public void MoveInventoryFolder(LLUUID userID, InventoryFolderBase folder) 113 public void MoveInventoryFolder(LLUUID userID, InventoryFolderBase folder)
124 { 114 {
115 // FIXME: Probably doesn't do what was originally intended - only ever queries the first plugin
125 foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins) 116 foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
126 { 117 {
127 plugin.Value.moveInventoryFolder(folder); 118 plugin.Value.moveInventoryFolder(folder);
@@ -137,7 +128,12 @@ namespace OpenSim.Framework.Communications
137 // See IInventoryServices 128 // See IInventoryServices
138 public InventoryFolderBase RequestRootFolder(LLUUID userID) 129 public InventoryFolderBase RequestRootFolder(LLUUID userID)
139 { 130 {
140 return RequestUsersRoot(userID); 131 // FIXME: Probably doesn't do what was originally intended - only ever queries the first plugin
132 foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
133 {
134 return plugin.Value.getUserRootFolder(userID);
135 }
136 return null;
141 } 137 }
142 138
143 // See IInventoryServices 139 // See IInventoryServices
@@ -149,7 +145,7 @@ namespace OpenSim.Framework.Communications
149 // See IInventoryServices 145 // See IInventoryServices
150 public void CreateNewUserInventory(LLUUID user) 146 public void CreateNewUserInventory(LLUUID user)
151 { 147 {
152 InventoryFolderBase existingRootFolder = RequestUsersRoot(user); 148 InventoryFolderBase existingRootFolder = RequestRootFolder(user);
153 149
154 if (null != existingRootFolder) 150 if (null != existingRootFolder)
155 { 151 {