diff options
Start of Inventory service, currently only (partially) functional in standalone mode and using sqlite).
In standalone mode, if you have account authenticate turned on (setting in opensim.ini) then when you create a new account, a set of inventory is created for that account and stored in database (currently only a set of empty folders). Then during login the database is search for that set and sent to the client in the login response.
More functions will be added soon, like creating new folders (and a bit later items) from the client inventory window.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/InventoryFolder.cs | 15 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Cache/UserProfileCache.cs | 6 |
2 files changed, 18 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs index 300a6e3..6b0e2b4 100644 --- a/OpenSim/Framework/Communications/Cache/InventoryFolder.cs +++ b/OpenSim/Framework/Communications/Cache/InventoryFolder.cs | |||
@@ -44,6 +44,21 @@ namespace OpenSim.Framework.Communications.Caches | |||
44 | public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>(); | 44 | public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>(); |
45 | public Dictionary<LLUUID, InventoryFolder> SubFolders = new Dictionary<LLUUID, InventoryFolder>(); | 45 | public Dictionary<LLUUID, InventoryFolder> SubFolders = new Dictionary<LLUUID, InventoryFolder>(); |
46 | 46 | ||
47 | public InventoryFolder(InventoryFolderBase folderbase) | ||
48 | { | ||
49 | this.agentID = folderbase.agentID; | ||
50 | this.folderID = folderbase.folderID; | ||
51 | this.name = folderbase.name; | ||
52 | this.parentID = folderbase.parentID; | ||
53 | this.type = folderbase.type; | ||
54 | this.version = folderbase.version; | ||
55 | } | ||
56 | |||
57 | public InventoryFolder() | ||
58 | { | ||
59 | |||
60 | } | ||
61 | |||
47 | // Methods | 62 | // Methods |
48 | public InventoryFolder CreateNewSubFolder(LLUUID folderID, string folderName, ushort type) | 63 | public InventoryFolder CreateNewSubFolder(LLUUID folderID, string folderName, ushort type) |
49 | { | 64 | { |
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs index 2f3691c..2271550 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs | |||
@@ -168,18 +168,18 @@ namespace OpenSim.Framework.Communications.Caches | |||
168 | /// <param name="userID"></param> | 168 | /// <param name="userID"></param> |
169 | private void RequestInventoryForUser(LLUUID userID, CachedUserInfo userInfo) | 169 | private void RequestInventoryForUser(LLUUID userID, CachedUserInfo userInfo) |
170 | { | 170 | { |
171 | // this.m_parent.InventoryServer.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive); | 171 | //this.m_parent.InventoryServer.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive); |
172 | 172 | ||
173 | //for now we manually create the root folder, | 173 | //for now we manually create the root folder, |
174 | // but should be requesting all inventory from inventory server. | 174 | // but should be requesting all inventory from inventory server. |
175 | InventoryFolder folderInfo = new InventoryFolder(); | 175 | /* InventoryFolder folderInfo = new InventoryFolder(); |
176 | folderInfo.agentID = userID; | 176 | folderInfo.agentID = userID; |
177 | folderInfo.folderID = userInfo.UserProfile.rootInventoryFolderID; | 177 | folderInfo.folderID = userInfo.UserProfile.rootInventoryFolderID; |
178 | folderInfo.name = "My Inventory"; | 178 | folderInfo.name = "My Inventory"; |
179 | folderInfo.parentID = LLUUID.Zero; | 179 | folderInfo.parentID = LLUUID.Zero; |
180 | folderInfo.type = 8; | 180 | folderInfo.type = 8; |
181 | folderInfo.version = 1; | 181 | folderInfo.version = 1; |
182 | userInfo.FolderReceive(userID, folderInfo); | 182 | userInfo.FolderReceive(userID, folderInfo);*/ |
183 | } | 183 | } |
184 | 184 | ||
185 | /// <summary> | 185 | /// <summary> |