diff options
author | Sean McNamara | 2011-04-10 18:28:54 -0400 |
---|---|---|
committer | Sean McNamara | 2011-04-10 18:28:54 -0400 |
commit | 9c0f3c73b1fd56ac145e866af0316a3285ddb689 (patch) | |
tree | 03541a853c2ecf5829ac296537b14d4553ad4b2e /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | Merge git://opensimulator.org/git/opensim (diff) | |
parent | minor: remove mono compiler warnings (diff) | |
download | opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.zip opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.gz opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.bz2 opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.xz |
Merge git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-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 fcbcf59..73dd531 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -2069,7 +2069,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2069 | SceneObjectPart[] partList = sog.Parts; | 2069 | SceneObjectPart[] partList = sog.Parts; |
2070 | 2070 | ||
2071 | foreach (SceneObjectPart child in partList) | 2071 | foreach (SceneObjectPart child in partList) |
2072 | { | ||
2072 | child.Inventory.ChangeInventoryOwner(ownerID); | 2073 | child.Inventory.ChangeInventoryOwner(ownerID); |
2074 | child.TriggerScriptChangedEvent(Changed.OWNER); | ||
2075 | } | ||
2073 | } | 2076 | } |
2074 | else | 2077 | else |
2075 | { | 2078 | { |
@@ -2085,6 +2088,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2085 | { | 2088 | { |
2086 | child.LastOwnerID = child.OwnerID; | 2089 | child.LastOwnerID = child.OwnerID; |
2087 | child.Inventory.ChangeInventoryOwner(groupID); | 2090 | child.Inventory.ChangeInventoryOwner(groupID); |
2091 | child.TriggerScriptChangedEvent(Changed.OWNER); | ||
2088 | } | 2092 | } |
2089 | 2093 | ||
2090 | sog.SetOwnerId(groupID); | 2094 | sog.SetOwnerId(groupID); |