diff options
Start of inventory items, when you upload a texture the data will now be stored in the inventory database and you will still have that texture in inventory on later logins (Again only in standalone mode with authentication.)
Also there might be some problems if you upload textures in other regions to the start one (due to us not updating the CAPS url properly).
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/CachedUserInfo.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index fc2f948..123e692 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
@@ -40,10 +40,16 @@ namespace OpenSim.Framework.Communications.Caches | |||
40 | { | 40 | { |
41 | public class CachedUserInfo | 41 | public class CachedUserInfo |
42 | { | 42 | { |
43 | private CommunicationsManager m_parentCommsManager; | ||
43 | // Fields | 44 | // Fields |
44 | public InventoryFolder RootFolder = null; | 45 | public InventoryFolder RootFolder = null; |
45 | public UserProfileData UserProfile = null; | 46 | public UserProfileData UserProfile = null; |
46 | 47 | ||
48 | public CachedUserInfo(CommunicationsManager commsManager) | ||
49 | { | ||
50 | m_parentCommsManager = commsManager; | ||
51 | } | ||
52 | |||
47 | // Methods | 53 | // Methods |
48 | public void FolderReceive(LLUUID userID, InventoryFolder folderInfo) | 54 | public void FolderReceive(LLUUID userID, InventoryFolder folderInfo) |
49 | { | 55 | { |
@@ -73,6 +79,7 @@ namespace OpenSim.Framework.Communications.Caches | |||
73 | 79 | ||
74 | public void ItemReceive(LLUUID userID, InventoryItemBase itemInfo) | 80 | public void ItemReceive(LLUUID userID, InventoryItemBase itemInfo) |
75 | { | 81 | { |
82 | Console.WriteLine("received new inventory item " + itemInfo.inventoryID + " with asset id of " + itemInfo.assetID); | ||
76 | if ((userID == this.UserProfile.UUID) && (this.RootFolder != null)) | 83 | if ((userID == this.UserProfile.UUID) && (this.RootFolder != null)) |
77 | { | 84 | { |
78 | if (itemInfo.parentFolderID == this.RootFolder.folderID) | 85 | if (itemInfo.parentFolderID == this.RootFolder.folderID) |
@@ -84,11 +91,23 @@ namespace OpenSim.Framework.Communications.Caches | |||
84 | InventoryFolder folder = this.RootFolder.HasSubFolder(itemInfo.parentFolderID); | 91 | InventoryFolder folder = this.RootFolder.HasSubFolder(itemInfo.parentFolderID); |
85 | if (folder != null) | 92 | if (folder != null) |
86 | { | 93 | { |
87 | folder.Items.Add(itemInfo.inventoryID, itemInfo); | 94 | folder.Items.Add(itemInfo.inventoryID, itemInfo); |
88 | } | 95 | } |
89 | } | 96 | } |
90 | } | 97 | } |
91 | } | 98 | } |
99 | |||
100 | public void AddItem(LLUUID userID, InventoryItemBase itemInfo) | ||
101 | { | ||
102 | if ((userID == this.UserProfile.UUID) && (this.RootFolder != null)) | ||
103 | { | ||
104 | this.ItemReceive(userID, itemInfo); | ||
105 | Console.WriteLine("now adding inventory item to database"); | ||
106 | this.m_parentCommsManager.InventoryServer.AddNewInventoryItem(userID, itemInfo); | ||
107 | } | ||
108 | } | ||
92 | } | 109 | } |
110 | |||
111 | |||
93 | } | 112 | } |
94 | 113 | ||