aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorUbitUmarov2017-05-04 12:08:10 +0100
committerUbitUmarov2017-05-04 12:08:10 +0100
commit34028198882be021c49725c342e8d2d494dc7286 (patch)
treedef2c1dbf006e8a37b1d3c17930338909d13860f /OpenSim/Region/OptionalModules
parent move deep effective permissions aggregation to first time use and not on cha... (diff)
downloadopensim-SC_OLD-34028198882be021c49725c342e8d2d494dc7286.zip
opensim-SC_OLD-34028198882be021c49725c342e8d2d494dc7286.tar.gz
opensim-SC_OLD-34028198882be021c49725c342e8d2d494dc7286.tar.bz2
opensim-SC_OLD-34028198882be021c49725c342e8d2d494dc7286.tar.xz
do the same in the cases we are just moving parts around and not changing their caches (ie their taskInventory)
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs2
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
index 92b5831..c3f3851 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
@@ -174,7 +174,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
174 child.TriggerScriptChangedEvent(Changed.OWNER); 174 child.TriggerScriptChangedEvent(Changed.OWNER);
175 child.ApplyNextOwnerPermissions(); 175 child.ApplyNextOwnerPermissions();
176 } 176 }
177 hostgroup.AggregatePerms(); 177 hostgroup.InvalidateEffectivePerms();
178 } 178 }
179 179
180 hostgroup.RootPart.ObjectSaleType = 0; 180 hostgroup.RootPart.ObjectSaleType = 0;
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
index 6cf0092..fe8d962 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
@@ -665,7 +665,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
665 taskItem.AssetID = asset.FullID; 665 taskItem.AssetID = asset.FullID;
666 666
667 host.Inventory.AddInventoryItem(taskItem, false); 667 host.Inventory.AddInventoryItem(taskItem, false);
668 host.ParentGroup.AggregatePerms(); 668 host.ParentGroup.InvalidateEffectivePerms();
669 m_comms.DispatchReply(scriptID,1,assetID.ToString(),reqID.ToString()); 669 m_comms.DispatchReply(scriptID,1,assetID.ToString(),reqID.ToString());
670 } 670 }
671 671
diff --git a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
index b26fa32..da8c9a3 100644
--- a/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
+++ b/OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs
@@ -525,7 +525,7 @@ namespace OpenSim.Region.OptionalModules.World.TreePopulator
525 525
526 sceneObject.SetGroup(groupID, null); 526 sceneObject.SetGroup(groupID, null);
527 m_scene.AddNewSceneObject(sceneObject, true); 527 m_scene.AddNewSceneObject(sceneObject, true);
528 sceneObject.AggregatePerms(); 528 sceneObject.InvalidateEffectivePerms();
529 return sceneObject; 529 return sceneObject;
530 } 530 }
531 531