diff options
| author | Teravus Ovares | 2008-05-16 22:50:37 +0000 |
|---|---|---|
| committer | Teravus Ovares | 2008-05-16 22:50:37 +0000 |
| commit | a510033df5bfc7e8c8b6f2498196a4e3e281c6a7 (patch) | |
| tree | 6a8f00966787f4391654e7f4d6c50bb1fbb8341c /OpenSim | |
| parent | * This finishes the ODE options section of the OpenSim.ini.example. I've adde... (diff) | |
| download | opensim-SC-a510033df5bfc7e8c8b6f2498196a4e3e281c6a7.zip opensim-SC-a510033df5bfc7e8c8b6f2498196a4e3e281c6a7.tar.gz opensim-SC-a510033df5bfc7e8c8b6f2498196a4e3e281c6a7.tar.bz2 opensim-SC-a510033df5bfc7e8c8b6f2498196a4e3e281c6a7.tar.xz | |
* Applying patch in mantis 0001293: [PATCH] Fix a bug that corrupts uploaded assets on disk write from Melane. Thanks Melanie!
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Framework/Communications/Capabilities/Caps.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs | 7 |
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 | |||
| 678 | item.InvType = inType; | 678 | item.InvType = inType; |
| 679 | item.Folder = parentFolder; | 679 | item.Folder = parentFolder; |
| 680 | item.CurrentPermissions = 2147483647; | 680 | item.CurrentPermissions = 2147483647; |
| 681 | item.BasePermissions = 2147483647; | ||
| 682 | item.EveryOnePermissions = 0; | ||
| 681 | item.NextPermissions = 2147483647; | 683 | item.NextPermissions = 2147483647; |
| 682 | 684 | ||
| 683 | if (AddNewInventoryItem != null) | 685 | 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 | |||
| 379 | item.AssetType = type; | 379 | item.AssetType = type; |
| 380 | item.InvType = invType; | 380 | item.InvType = invType; |
| 381 | item.Folder = InventFolder; | 381 | item.Folder = InventFolder; |
| 382 | item.BasePermissions = 2147483647; | 382 | item.BasePermissions = 0x7fffffff; |
| 383 | item.CurrentPermissions = 2147483647; | 383 | item.CurrentPermissions = 0x7fffffff; |
| 384 | item.EveryOnePermissions=0; | ||
| 384 | item.NextPermissions = nextPerm; | 385 | item.NextPermissions = nextPerm; |
| 385 | item.Flags = (uint) wearableType; | 386 | item.Flags = (uint) wearableType; |
| 386 | 387 | ||
| @@ -401,4 +402,4 @@ namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction | |||
| 401 | 402 | ||
| 402 | #endregion | 403 | #endregion |
| 403 | } | 404 | } |
| 404 | } \ No newline at end of file | 405 | } |