aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
diff options
context:
space:
mode:
authorMelanie2010-05-03 01:40:24 +0100
committerMelanie2010-05-03 01:40:24 +0100
commit9f8acbfe3e6206893822bc3b7edbadbd7cae7a16 (patch)
treedd9485b0c6b4cbfa0399501f43d7d70d4ed438aa /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
parentMake the IUserAccountData properly unpack the god mode data, so grid gods (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-9f8acbfe3e6206893822bc3b7edbadbd7cae7a16.zip
opensim-SC-9f8acbfe3e6206893822bc3b7edbadbd7cae7a16.tar.gz
opensim-SC-9f8acbfe3e6206893822bc3b7edbadbd7cae7a16.tar.bz2
opensim-SC-9f8acbfe3e6206893822bc3b7edbadbd7cae7a16.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index bc3225a..64282d1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -1082,12 +1082,11 @@ namespace OpenSim.Region.Framework.Scenes
1082 item.CurrentPermissions &= ~(uint)PermissionMask.Modify; 1082 item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
1083 item.CurrentPermissions |= 8; 1083 item.CurrentPermissions |= 8;
1084 } 1084 }
1085 item.OwnerChanged = true;
1085 item.CurrentPermissions &= item.NextPermissions; 1086 item.CurrentPermissions &= item.NextPermissions;
1086 item.BasePermissions &= item.NextPermissions; 1087 item.BasePermissions &= item.NextPermissions;
1087 item.EveryonePermissions &= item.NextPermissions; 1088 item.EveryonePermissions &= item.NextPermissions;
1088 } 1089 }
1089
1090 m_part.TriggerScriptChangedEvent(Changed.OWNER);
1091 } 1090 }
1092 1091
1093 public void ApplyGodPermissions(uint perms) 1092 public void ApplyGodPermissions(uint perms)
@@ -1180,7 +1179,10 @@ namespace OpenSim.Region.Framework.Scenes
1180 foreach (IScriptModule engine in engines) 1179 foreach (IScriptModule engine in engines)
1181 { 1180 {
1182 if (engine != null) 1181 if (engine != null)
1182 {
1183 engine.PostScriptEvent(item.ItemID, "changed", new Object[] { Changed.OWNER });
1183 engine.ResumeScript(item.ItemID); 1184 engine.ResumeScript(item.ItemID);
1185 }
1184 } 1186 }
1185 } 1187 }
1186 } 1188 }