aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
diff options
context:
space:
mode:
authorUbitUmarov2017-01-17 13:24:09 +0000
committerUbitUmarov2017-01-17 13:24:09 +0000
commitdb2fbf6516a055beb71de9b82a9773c29bf3a73d (patch)
tree63aeb5610c0cd97d473254623dac28b17d7ef24e /OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
parentadd more calls to effective permissions aggregation; do not change groupmask ... (diff)
downloadopensim-SC-db2fbf6516a055beb71de9b82a9773c29bf3a73d.zip
opensim-SC-db2fbf6516a055beb71de9b82a9773c29bf3a73d.tar.gz
opensim-SC-db2fbf6516a055beb71de9b82a9773c29bf3a73d.tar.bz2
opensim-SC-db2fbf6516a055beb71de9b82a9773c29bf3a73d.tar.xz
add more calls to effective permissions aggregation, some paths may still be missing on objects changes, but remove the aggregation on check paths, so all can be tested.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 399e341..5ecf352 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -171,7 +171,7 @@ namespace OpenSim.Region.Framework.Scenes
171 bool addFromAllowedDrop = agentID != part.OwnerID; 171 bool addFromAllowedDrop = agentID != part.OwnerID;
172 172
173 part.Inventory.AddInventoryItem(taskItem, addFromAllowedDrop); 173 part.Inventory.AddInventoryItem(taskItem, addFromAllowedDrop);
174 174 part.ParentGroup.AggregatePerms();
175 return true; 175 return true;
176 } 176 }
177 else 177 else
@@ -259,7 +259,7 @@ namespace OpenSim.Region.Framework.Scenes
259 // this can't be done here but on every place where a change may happen (rez, (de)link, contents , perms, etc) 259 // this can't be done here but on every place where a change may happen (rez, (de)link, contents , perms, etc)
260 // bc this is on heavy duty code paths 260 // bc this is on heavy duty code paths
261 // but for now we need to test the concept 261 // but for now we need to test the concept
262 AggregateDeepPerms(); 262// AggregateDeepPerms();
263 return m_EffectiveEveryOnePerms; 263 return m_EffectiveEveryOnePerms;
264 } 264 }
265 } 265 }
@@ -272,7 +272,7 @@ namespace OpenSim.Region.Framework.Scenes
272 // this can't be done here but on every place where a change may happen (rez, (de)link, contents , perms, etc) 272 // this can't be done here but on every place where a change may happen (rez, (de)link, contents , perms, etc)
273 // bc this is on heavy duty code paths 273 // bc this is on heavy duty code paths
274 // but for now we need to test the concept 274 // but for now we need to test the concept
275 AggregateDeepPerms(); 275// AggregateDeepPerms();
276 return m_EffectiveGroupPerms; 276 return m_EffectiveGroupPerms;
277 } 277 }
278 } 278 }
@@ -285,7 +285,7 @@ namespace OpenSim.Region.Framework.Scenes
285 // this can't be done here but on every place where a change may happen (rez, (de)link, contents , perms, etc) 285 // this can't be done here but on every place where a change may happen (rez, (de)link, contents , perms, etc)
286 // bc this is on heavy duty code paths 286 // bc this is on heavy duty code paths
287 // but for now we need to test the concept 287 // but for now we need to test the concept
288 AggregateDeepPerms(); 288// AggregateDeepPerms();
289 return m_EffectiveGroupOrEveryOnePerms; 289 return m_EffectiveGroupOrEveryOnePerms;
290 } 290 }
291 } 291 }
@@ -298,7 +298,7 @@ namespace OpenSim.Region.Framework.Scenes
298 // this can't be done here but on every place where a change may happen (rez, (de)link, contents , perms, etc) 298 // this can't be done here but on every place where a change may happen (rez, (de)link, contents , perms, etc)
299 // bc this is on heavy duty code paths 299 // bc this is on heavy duty code paths
300 // but for now we need to test the concept 300 // but for now we need to test the concept
301 AggregateDeepPerms(); 301 // AggregateDeepPerms();
302 return m_EffectiveOwnerPerms; 302 return m_EffectiveOwnerPerms;
303 } 303 }
304 } 304 }