diff options
| author | UbitUmarov | 2017-11-08 01:53:36 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-11-08 01:53:36 +0000 |
| commit | 8479658cd0d395b3a91cb93821fac6166569df17 (patch) | |
| tree | 59972e2d60ab1a1727a1092f4eb3c339af3c31b8 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | |
| parent | Add a new experimental implementation of PGSQL FSAssets (diff) | |
| download | opensim-SC-8479658cd0d395b3a91cb93821fac6166569df17.zip opensim-SC-8479658cd0d395b3a91cb93821fac6166569df17.tar.gz opensim-SC-8479658cd0d395b3a91cb93821fac6166569df17.tar.bz2 opensim-SC-8479658cd0d395b3a91cb93821fac6166569df17.tar.xz | |
remove a potencial (and silly) deadlock; let other texture parameters changes trigger Changed.TEXTURE event
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs index f778367..bf217a5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | |||
| @@ -358,7 +358,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 358 | SceneObjectPart part = parts[i]; | 358 | SceneObjectPart part = parts[i]; |
| 359 | 359 | ||
| 360 | if(m_DeepEffectivePermsInvalid) | 360 | if(m_DeepEffectivePermsInvalid) |
| 361 | part.AggregateInnerPerms(); | 361 | part.AggregatedInnerPermsForGroup(); |
| 362 | 362 | ||
| 363 | owner &= part.AggregatedInnerOwnerPerms; | 363 | owner &= part.AggregatedInnerOwnerPerms; |
| 364 | group &= part.AggregatedInnerGroupPerms; | 364 | group &= part.AggregatedInnerGroupPerms; |