Can now turn on/off server side permission checking (on prim editing etc) from the opensim.ini file. Just add a line to the Startup section like : serverside_object_permissions = true

Changes /editing that are made to clothing/ body parts in your inventory should now be saved between logins/ restarts.

5 files changed, 26 insertions, 11 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
index addd20a..4cde5f6 100644
--- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs
@@ -103,6 +103,15 @@ namespace OpenSim.Framework.Communications.Caches
             }
         }
 
+        public AssetBase GetTransactionAsset(LLUUID transactionID)
+        {
+            if (this.XferUploaders.ContainsKey(transactionID))
+            {
+                return XferUploaders[transactionID].GetAssetData();
+            }
+            return null;
+        }
+
         // Nested Types
         public class AssetCapsUploader
         {
@@ -298,6 +307,7 @@ namespace OpenSim.Framework.Communications.Caches
 
             private void DoCreateItem()
             {
+                //really need to fix this call, if lbsa71 saw this he would die. 
                 this.m_userTransactions.Manager.CommsManager.AssetCache.AddAsset(this.Asset);
                 CachedUserInfo userInfo = m_userTransactions.Manager.CommsManager.UserProfiles.GetUserDetails(ourClient.AgentId);
                 if (userInfo != null)
@@ -324,6 +334,15 @@ namespace OpenSim.Framework.Communications.Caches
             {
 
             }
+
+            public AssetBase GetAssetData()
+            {
+                if (m_finished)
+                {
+                    return this.Asset;
+                }
+                return null;
+            }
         }
 
         public class NoteCardCapsUpdate
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 6d85477..deef028 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -9,6 +9,10 @@ using Nini.Config;
 
 namespace OpenSim.Framework.Communications.Caches
 {
+    /// <summary>
+    /// Basically a hack to give us a Inventory library while we don't have a inventory server
+    /// once the server is fully implemented then should read the data from that
+    /// </summary>
     public class LibraryRootFolder : InventoryFolder
     {
         private LLUUID libOwner = new LLUUID("11111111-1111-0000-0000-000100bba000");
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
index 02c5f65..a599a19 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCache.cs
@@ -182,17 +182,6 @@ namespace OpenSim.Framework.Communications.Caches
         private void RequestInventoryForUser(LLUUID userID, CachedUserInfo userInfo)
         {
              this.m_parent.InventoryServer.RequestInventoryForUser(userID, userInfo.FolderReceive, userInfo.ItemReceive);
-
-            //for now we manually create the root folder,
-            // but should be requesting all inventory from inventory server.
-           /* InventoryFolder folderInfo = new InventoryFolder();
-            folderInfo.agentID = userID;
-            folderInfo.folderID = userInfo.UserProfile.rootInventoryFolderID;
-            folderInfo.name = "My Inventory";
-            folderInfo.parentID = LLUUID.Zero;
-            folderInfo.type = 8;
-            folderInfo.version = 1;
-            userInfo.FolderReceive(userID, folderInfo);*/
         }
 
         /// <summary>
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index a233d68..8337a81 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -87,6 +87,7 @@ namespace OpenSim.Framework.Interfaces
     public delegate void FetchInventoryDescendents(IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder);
     public delegate void FetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID);
     public delegate void RequestTaskInventory(IClientAPI remoteClient, uint localID);
+    public delegate void UpdateInventoryItemTransaction(IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID, LLUUID itemID);
 
     public delegate void UDPAssetUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data);
     public delegate void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data);
@@ -141,6 +142,7 @@ namespace OpenSim.Framework.Interfaces
         event FetchInventoryDescendents OnFetchInventoryDescendents;
         event FetchInventory OnFetchInventory;
         event RequestTaskInventory OnRequestTaskInventory;
+        event UpdateInventoryItemTransaction OnUpdateInventoryItem;
         event UDPAssetUploadRequest OnAssetUploadRequest;
         event XferReceive OnXferReceive;
         event RequestXfer OnRequestXfer;
diff --git a/OpenSim/Framework/General/NullClientAPI.cs b/OpenSim/Framework/General/NullClientAPI.cs
index 901b130..e6749fc 100644
--- a/OpenSim/Framework/General/NullClientAPI.cs
+++ b/OpenSim/Framework/General/NullClientAPI.cs
@@ -58,6 +58,7 @@ namespace OpenSim.Framework
        public event FetchInventoryDescendents OnFetchInventoryDescendents;
        public event FetchInventory OnFetchInventory;
        public event RequestTaskInventory OnRequestTaskInventory;
+       public event UpdateInventoryItemTransaction OnUpdateInventoryItem;
        public event UDPAssetUploadRequest OnAssetUploadRequest;
        public event XferReceive OnXferReceive;
        public event RequestXfer OnRequestXfer;