aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.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/SceneObjectPart.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/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 0817144..69d8288 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -476,8 +476,8 @@ namespace OpenSim.Region.Framework.Scenes
476 APIDActive = false; 476 APIDActive = false;
477 Flags = 0; 477 Flags = 0;
478 CreateSelected = true; 478 CreateSelected = true;
479
480 TrimPermissions(); 479 TrimPermissions();
480 AggregateInnerPerms();
481 } 481 }
482 482
483 #endregion Constructors 483 #endregion Constructors
@@ -4495,7 +4495,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
4495 4495
4496 break; 4496 break;
4497 } 4497 }
4498 4498 AggregateInnerPerms();
4499 SendFullUpdateToAllClients(); 4499 SendFullUpdateToAllClients();
4500 } 4500 }
4501 } 4501 }
@@ -4512,6 +4512,8 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
4512 EveryoneMask = source.EveryoneMask & BaseMask; 4512 EveryoneMask = source.EveryoneMask & BaseMask;
4513 NextOwnerMask = source.NextOwnerMask & BaseMask; 4513 NextOwnerMask = source.NextOwnerMask & BaseMask;
4514 4514
4515 AggregateInnerPerms();
4516
4515 if (OwnerMask != prevOwnerMask || 4517 if (OwnerMask != prevOwnerMask ||
4516 GroupMask != prevGroupMask || 4518 GroupMask != prevGroupMask ||
4517 EveryoneMask != prevEveryoneMask || 4519 EveryoneMask != prevEveryoneMask ||
@@ -5335,6 +5337,7 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
5335 item.OwnerChanged = false; 5337 item.OwnerChanged = false;
5336 Inventory.UpdateInventoryItem(item, false, false); 5338 Inventory.UpdateInventoryItem(item, false, false);
5337 } 5339 }
5340 AggregateInnerPerms();
5338 } 5341 }
5339 5342
5340 /// <summary> 5343 /// <summary>