diff options
| author | Teravus Ovares (Dan Olivares) | 2010-10-14 03:23:37 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2010-10-14 03:23:37 -0400 |
| commit | 9c5f8a680290b7356c010080d4dfec29caee2fa6 (patch) | |
| tree | 40449caca61a09b15098277510edfbd0b3972616 /OpenSim/Framework | |
| parent | Rename file + more testing and tweaking (diff) | |
| parent | Kill some magic numbers in the caps module (diff) | |
| download | opensim-SC-9c5f8a680290b7356c010080d4dfec29caee2fa6.zip opensim-SC-9c5f8a680290b7356c010080d4dfec29caee2fa6.tar.gz opensim-SC-9c5f8a680290b7356c010080d4dfec29caee2fa6.tar.bz2 opensim-SC-9c5f8a680290b7356c010080d4dfec29caee2fa6.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Capabilities/Caps.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs index 6f32adf..72283de 100644 --- a/OpenSim/Framework/Capabilities/Caps.cs +++ b/OpenSim/Framework/Capabilities/Caps.cs | |||
| @@ -962,10 +962,10 @@ namespace OpenSim.Framework.Capabilities | |||
| 962 | item.AssetType = assType; | 962 | item.AssetType = assType; |
| 963 | item.InvType = inType; | 963 | item.InvType = inType; |
| 964 | item.Folder = parentFolder; | 964 | item.Folder = parentFolder; |
| 965 | item.CurrentPermissions = 2147483647; | 965 | item.CurrentPermissions = (uint)PermissionMask.All; |
| 966 | item.BasePermissions = 2147483647; | 966 | item.BasePermissions = (uint)PermissionMask.All; |
| 967 | item.EveryOnePermissions = 0; | 967 | item.EveryOnePermissions = 0; |
| 968 | item.NextPermissions = 2147483647; | 968 | item.NextPermissions = (uint)(PermissionMask.Move | PermissionMask.Modify | PermissionMask.Transfer); |
| 969 | item.CreationDate = Util.UnixTimeSinceEpoch(); | 969 | item.CreationDate = Util.UnixTimeSinceEpoch(); |
| 970 | 970 | ||
| 971 | if (AddNewInventoryItem != null) | 971 | if (AddNewInventoryItem != null) |