diff options
Diffstat (limited to 'OpenSim/Framework/Communications/InventoryServiceBase.cs')
-rw-r--r-- | OpenSim/Framework/Communications/InventoryServiceBase.cs | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs index 05183be..effe132 100644 --- a/OpenSim/Framework/Communications/InventoryServiceBase.cs +++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs | |||
@@ -30,10 +30,8 @@ using System; | |||
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using libsecondlife; | 32 | using libsecondlife; |
33 | using OpenSim.Framework.Communications; | ||
34 | using OpenSim.Framework.Communications.Cache; | 33 | using OpenSim.Framework.Communications.Cache; |
35 | using OpenSim.Framework.Console; | 34 | using OpenSim.Framework.Console; |
36 | using OpenSim.Framework; | ||
37 | 35 | ||
38 | namespace OpenSim.Framework.Communications | 36 | namespace OpenSim.Framework.Communications |
39 | { | 37 | { |
@@ -67,10 +65,10 @@ namespace OpenSim.Framework.Communications | |||
67 | if (typeInterface != null) | 65 | if (typeInterface != null) |
68 | { | 66 | { |
69 | IInventoryData plug = | 67 | IInventoryData plug = |
70 | (IInventoryData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | 68 | (IInventoryData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); |
71 | plug.Initialise(); | 69 | plug.Initialise(); |
72 | this.m_plugins.Add(plug.getName(), plug); | 70 | m_plugins.Add(plug.getName(), plug); |
73 | MainLog.Instance.Verbose("INVENTORY","Added IInventoryData Interface"); | 71 | MainLog.Instance.Verbose("INVENTORY", "Added IInventoryData Interface"); |
74 | } | 72 | } |
75 | } | 73 | } |
76 | } | 74 | } |
@@ -168,7 +166,7 @@ namespace OpenSim.Framework.Communications | |||
168 | { | 166 | { |
169 | foreach (InventoryFolderBase folder in inventory.Folders.Values) | 167 | foreach (InventoryFolderBase folder in inventory.Folders.Values) |
170 | { | 168 | { |
171 | this.AddFolder(folder); | 169 | AddFolder(folder); |
172 | } | 170 | } |
173 | } | 171 | } |
174 | 172 | ||
@@ -176,7 +174,7 @@ namespace OpenSim.Framework.Communications | |||
176 | { | 174 | { |
177 | UsersInventory inven = new UsersInventory(); | 175 | UsersInventory inven = new UsersInventory(); |
178 | inven.CreateNewInventorySet(user); | 176 | inven.CreateNewInventorySet(user); |
179 | this.AddNewInventorySet(inven); | 177 | AddNewInventorySet(inven); |
180 | } | 178 | } |
181 | 179 | ||
182 | public class UsersInventory | 180 | public class UsersInventory |
@@ -186,7 +184,6 @@ namespace OpenSim.Framework.Communications | |||
186 | 184 | ||
187 | public UsersInventory() | 185 | public UsersInventory() |
188 | { | 186 | { |
189 | |||
190 | } | 187 | } |
191 | 188 | ||
192 | public virtual void CreateNewInventorySet(LLUUID user) | 189 | public virtual void CreateNewInventorySet(LLUUID user) |
@@ -231,9 +228,11 @@ namespace OpenSim.Framework.Communications | |||
231 | } | 228 | } |
232 | } | 229 | } |
233 | 230 | ||
234 | public abstract void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, InventoryItemInfo itemCallBack); | 231 | public abstract void RequestInventoryForUser(LLUUID userID, InventoryFolderInfo folderCallBack, |
232 | InventoryItemInfo itemCallBack); | ||
233 | |||
235 | public abstract void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder); | 234 | public abstract void AddNewInventoryFolder(LLUUID userID, InventoryFolderImpl folder); |
236 | public abstract void AddNewInventoryItem(LLUUID userID, InventoryItemBase item); | 235 | public abstract void AddNewInventoryItem(LLUUID userID, InventoryItemBase item); |
237 | public abstract void DeleteInventoryItem(LLUUID userID, InventoryItemBase item); | 236 | public abstract void DeleteInventoryItem(LLUUID userID, InventoryItemBase item); |
238 | } | 237 | } |
239 | } | 238 | } \ No newline at end of file |