diff options
author | Melanie | 2011-04-03 14:15:29 +0100 |
---|---|---|
committer | Melanie | 2011-04-03 14:15:29 +0100 |
commit | 89a65df1608de04ecddb1c7bcb3bdcf9eccb2c6e (patch) | |
tree | fe78194c4c229cb4c831a12ae84b56e9d21d608a | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Make CHANGED_OWNER work for deeding and god-mode in-world change (diff) | |
download | opensim-SC-89a65df1608de04ecddb1c7bcb3bdcf9eccb2c6e.zip opensim-SC-89a65df1608de04ecddb1c7bcb3bdcf9eccb2c6e.tar.gz opensim-SC-89a65df1608de04ecddb1c7bcb3bdcf9eccb2c6e.tar.bz2 opensim-SC-89a65df1608de04ecddb1c7bcb3bdcf9eccb2c6e.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 63fed6b..0748954 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -2122,7 +2122,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2122 | SceneObjectPart[] partList = sog.Parts; | 2122 | SceneObjectPart[] partList = sog.Parts; |
2123 | 2123 | ||
2124 | foreach (SceneObjectPart child in partList) | 2124 | foreach (SceneObjectPart child in partList) |
2125 | { | ||
2125 | child.Inventory.ChangeInventoryOwner(ownerID); | 2126 | child.Inventory.ChangeInventoryOwner(ownerID); |
2127 | child.TriggerScriptChangedEvent(Changed.OWNER); | ||
2128 | } | ||
2126 | } | 2129 | } |
2127 | else | 2130 | else |
2128 | { | 2131 | { |
@@ -2138,6 +2141,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2138 | { | 2141 | { |
2139 | child.LastOwnerID = child.OwnerID; | 2142 | child.LastOwnerID = child.OwnerID; |
2140 | child.Inventory.ChangeInventoryOwner(groupID); | 2143 | child.Inventory.ChangeInventoryOwner(groupID); |
2144 | child.TriggerScriptChangedEvent(Changed.OWNER); | ||
2141 | } | 2145 | } |
2142 | 2146 | ||
2143 | sog.SetOwnerId(groupID); | 2147 | sog.SetOwnerId(groupID); |