diff options
author | MW | 2007-08-14 17:48:25 +0000 |
---|---|---|
committer | MW | 2007-08-14 17:48:25 +0000 |
commit | 20b50489c0d57a5e3335c8329ba0133cfa7b7f8d (patch) | |
tree | 7f2b27b6acafaf08183ea86122ab59e8b2d13de5 | |
parent | Start of inventory items, when you upload a texture the data will now be stor... (diff) | |
download | opensim-SC-20b50489c0d57a5e3335c8329ba0133cfa7b7f8d.zip opensim-SC-20b50489c0d57a5e3335c8329ba0133cfa7b7f8d.tar.gz opensim-SC-20b50489c0d57a5e3335c8329ba0133cfa7b7f8d.tar.bz2 opensim-SC-20b50489c0d57a5e3335c8329ba0133cfa7b7f8d.tar.xz |
Can now create some new empty inventory items (like notecards and scripts) from the create menu in the inventory window. Although currently you can't update/edit them (and have those changes saved).
-rw-r--r-- | OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index 123e692..57c79b4 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
@@ -79,7 +79,6 @@ namespace OpenSim.Framework.Communications.Caches | |||
79 | 79 | ||
80 | public void ItemReceive(LLUUID userID, InventoryItemBase itemInfo) | 80 | public void ItemReceive(LLUUID userID, InventoryItemBase itemInfo) |
81 | { | 81 | { |
82 | Console.WriteLine("received new inventory item " + itemInfo.inventoryID + " with asset id of " + itemInfo.assetID); | ||
83 | if ((userID == this.UserProfile.UUID) && (this.RootFolder != null)) | 82 | if ((userID == this.UserProfile.UUID) && (this.RootFolder != null)) |
84 | { | 83 | { |
85 | if (itemInfo.parentFolderID == this.RootFolder.folderID) | 84 | if (itemInfo.parentFolderID == this.RootFolder.folderID) |
@@ -102,7 +101,6 @@ namespace OpenSim.Framework.Communications.Caches | |||
102 | if ((userID == this.UserProfile.UUID) && (this.RootFolder != null)) | 101 | if ((userID == this.UserProfile.UUID) && (this.RootFolder != null)) |
103 | { | 102 | { |
104 | this.ItemReceive(userID, itemInfo); | 103 | this.ItemReceive(userID, itemInfo); |
105 | Console.WriteLine("now adding inventory item to database"); | ||
106 | this.m_parentCommsManager.InventoryServer.AddNewInventoryItem(userID, itemInfo); | 104 | this.m_parentCommsManager.InventoryServer.AddNewInventoryItem(userID, itemInfo); |
107 | } | 105 | } |
108 | } | 106 | } |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index f83e43c..73133d4 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -609,7 +609,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
609 | 609 | ||
610 | client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); | 610 | client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); |
611 | 611 | ||
612 | //client.OnCreateNewInventoryItem += CreateNewInventoryItem; | 612 | client.OnCreateNewInventoryItem += CreateNewInventoryItem; |
613 | client.OnCreateNewInventoryFolder += commsManager.UserProfiles.HandleCreateInventoryFolder; | 613 | client.OnCreateNewInventoryFolder += commsManager.UserProfiles.HandleCreateInventoryFolder; |
614 | client.OnFetchInventoryDescendents += commsManager.UserProfiles.HandleFecthInventoryDescendents; | 614 | client.OnFetchInventoryDescendents += commsManager.UserProfiles.HandleFecthInventoryDescendents; |
615 | client.OnRequestTaskInventory += RequestTaskInventory; | 615 | client.OnRequestTaskInventory += RequestTaskInventory; |