diff options
author | Melanie | 2013-06-11 21:03:02 +0100 |
---|---|---|
committer | Melanie | 2013-06-11 21:03:02 +0100 |
commit | 162dfd8a381999cf5883f4886b9b9aee3a3ad149 (patch) | |
tree | c1c20d043ede7be76e7131218585336ad9df0219 /OpenSim/Region | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Put the "script saved" and "notecard saved" messages back into the bottom (diff) | |
download | opensim-SC-162dfd8a381999cf5883f4886b9b9aee3a3ad149.zip opensim-SC-162dfd8a381999cf5883f4886b9b9aee3a3ad149.tar.gz opensim-SC-162dfd8a381999cf5883f4886b9b9aee3a3ad149.tar.bz2 opensim-SC-162dfd8a381999cf5883f4886b9b9aee3a3ad149.tar.xz |
Merge branch 'avination-current' into careminster
Diffstat (limited to '')
3 files changed, 16 insertions, 13 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 59b9585..8241e07 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -990,13 +990,20 @@ namespace OpenSim.Region.ClientStack.Linden | |||
990 | else | 990 | else |
991 | prim.Name = assetName + "#" + i.ToString(); | 991 | prim.Name = assetName + "#" + i.ToString(); |
992 | 992 | ||
993 | prim.EveryoneMask = 0; | ||
994 | prim.GroupMask = 0; | ||
995 | |||
993 | if (restrictPerms) | 996 | if (restrictPerms) |
994 | { | 997 | { |
995 | prim.BaseMask = (uint)(PermissionMask.Move | PermissionMask.Modify); | 998 | prim.BaseMask = (uint)(PermissionMask.Move | PermissionMask.Modify); |
996 | prim.EveryoneMask = 0; | ||
997 | prim.GroupMask = 0; | ||
998 | prim.NextOwnerMask = 0; | ||
999 | prim.OwnerMask = (uint)(PermissionMask.Move | PermissionMask.Modify); | 999 | prim.OwnerMask = (uint)(PermissionMask.Move | PermissionMask.Modify); |
1000 | prim.NextOwnerMask = 0; | ||
1001 | } | ||
1002 | else | ||
1003 | { | ||
1004 | prim.BaseMask = (uint)PermissionMask.All | (uint)PermissionMask.Export; | ||
1005 | prim.OwnerMask = (uint)PermissionMask.All | (uint)PermissionMask.Export; | ||
1006 | prim.NextOwnerMask = (uint)PermissionMask.Transfer; | ||
1000 | } | 1007 | } |
1001 | 1008 | ||
1002 | if(istest) | 1009 | if(istest) |
@@ -1099,21 +1106,17 @@ namespace OpenSim.Region.ClientStack.Linden | |||
1099 | 1106 | ||
1100 | if (restrictPerms) | 1107 | if (restrictPerms) |
1101 | { | 1108 | { |
1102 | item.CurrentPermissions | ||
1103 | = (uint)(PermissionMask.Move | PermissionMask.Modify); | ||
1104 | |||
1105 | item.BasePermissions = (uint)(PermissionMask.Move | PermissionMask.Modify); | 1109 | item.BasePermissions = (uint)(PermissionMask.Move | PermissionMask.Modify); |
1110 | item.CurrentPermissions = (uint)(PermissionMask.Move | PermissionMask.Modify); | ||
1106 | item.EveryOnePermissions = 0; | 1111 | item.EveryOnePermissions = 0; |
1107 | item.NextPermissions = 0; | 1112 | item.NextPermissions = 0; |
1108 | } | 1113 | } |
1109 | else | 1114 | else |
1110 | { | 1115 | { |
1111 | item.CurrentPermissions | ||
1112 | = (uint)(PermissionMask.Move | PermissionMask.Copy | PermissionMask.Modify | PermissionMask.Transfer | PermissionMask.Export); | ||
1113 | |||
1114 | item.BasePermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export; | 1116 | item.BasePermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export; |
1117 | item.CurrentPermissions = (uint)PermissionMask.All | (uint)PermissionMask.Export; | ||
1115 | item.EveryOnePermissions = 0; | 1118 | item.EveryOnePermissions = 0; |
1116 | item.NextPermissions = (uint)PermissionMask.All; | 1119 | item.NextPermissions = (uint)PermissionMask.Transfer; |
1117 | } | 1120 | } |
1118 | 1121 | ||
1119 | item.CreationDate = Util.UnixTimeSinceEpoch(); | 1122 | item.CreationDate = Util.UnixTimeSinceEpoch(); |
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 0f03ad0..a60b314 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -1147,7 +1147,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
1147 | AttachmentPt &= 0x7f; | 1147 | AttachmentPt &= 0x7f; |
1148 | 1148 | ||
1149 | // Calls attach with a Zero position | 1149 | // Calls attach with a Zero position |
1150 | if (AttachObject(sp, part.ParentGroup, AttachmentPt, false, false, false, append)) | 1150 | if (AttachObject(sp, part.ParentGroup, AttachmentPt, false, false, true, append)) |
1151 | { | 1151 | { |
1152 | if (DebugLevel > 0) | 1152 | if (DebugLevel > 0) |
1153 | m_log.Debug( | 1153 | m_log.Debug( |
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index d5c2661..588da10 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -265,7 +265,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
265 | return UUID.Zero; | 265 | return UUID.Zero; |
266 | } | 266 | } |
267 | 267 | ||
268 | remoteClient.SendAgentAlertMessage("Notecard saved", false); | 268 | remoteClient.SendAlertMessage("Notecard saved"); |
269 | } | 269 | } |
270 | else if ((InventoryType)item.InvType == InventoryType.LSL) | 270 | else if ((InventoryType)item.InvType == InventoryType.LSL) |
271 | { | 271 | { |
@@ -275,7 +275,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
275 | return UUID.Zero; | 275 | return UUID.Zero; |
276 | } | 276 | } |
277 | 277 | ||
278 | remoteClient.SendAgentAlertMessage("Script saved", false); | 278 | remoteClient.SendAlertMessage("Script saved"); |
279 | } | 279 | } |
280 | 280 | ||
281 | AssetBase asset = | 281 | AssetBase asset = |