* Applying patch in mantis 0001293: [PATCH] Fix a bug that corrupts uploaded assets on disk write from Melane. Thanks Melanie!

2 files changed, 6 insertions, 3 deletions

diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index dac2f34..9725c94 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -678,6 +678,8 @@ namespace OpenSim.Framework.Communications.Capabilities
             item.InvType = inType;
             item.Folder = parentFolder;
             item.CurrentPermissions = 2147483647;
+            item.BasePermissions = 2147483647;
+            item.EveryOnePermissions = 0;
             item.NextPermissions = 2147483647;
 
             if (AddNewInventoryItem != null)
diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index 65785af..b401cdb 100644
--- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -379,8 +379,9 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
                     item.AssetType = type;
                     item.InvType = invType;
                     item.Folder = InventFolder;
-                    item.BasePermissions = 2147483647;
-                    item.CurrentPermissions = 2147483647;
+                    item.BasePermissions = 0x7fffffff;
+                    item.CurrentPermissions = 0x7fffffff;
+                                        item.EveryOnePermissions=0;
                     item.NextPermissions = nextPerm;
                     item.Flags = (uint) wearableType;
 
@@ -401,4 +402,4 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction
 
         #endregion
     }
-}
\ No newline at end of file
+}