aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
diff options
context:
space:
mode:
authorUbitUmarov2017-05-04 11:37:13 +0100
committerUbitUmarov2017-05-04 11:37:13 +0100
commit3a8dd24fd1c1aead0a81a4a9d63b59bbf9f10855 (patch)
tree746ee2b8b01f1164dc815293b63086d959c05eb4 /OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
parentfix right to change permissions of group owned objects (diff)
downloadopensim-SC_OLD-3a8dd24fd1c1aead0a81a4a9d63b59bbf9f10855.zip
opensim-SC_OLD-3a8dd24fd1c1aead0a81a4a9d63b59bbf9f10855.tar.gz
opensim-SC_OLD-3a8dd24fd1c1aead0a81a4a9d63b59bbf9f10855.tar.bz2
opensim-SC_OLD-3a8dd24fd1c1aead0a81a4a9d63b59bbf9f10855.tar.xz
move deep effective permissions aggregation to first time use and not on changes. There flag it is need with InvalidateDeepEffectivePerms(). Add config options PropagateGroupShareOutwards and PropagateAnyOneOutwards
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 87d1ace..892403b 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -114,7 +114,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
114 // Script state may, or may not, exist. Not having any, is NOT 114 // Script state may, or may not, exist. Not having any, is NOT
115 // ever a problem. 115 // ever a problem.
116 sceneObject.LoadScriptState(reader); 116 sceneObject.LoadScriptState(reader);
117 sceneObject.AggregateDeepPerms(); 117 sceneObject.InvalidateDeepEffectivePerms();
118 return sceneObject; 118 return sceneObject;
119 } 119 }
120 120
@@ -278,7 +278,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
278 // Script state may, or may not, exist. Not having any, is NOT 278 // Script state may, or may not, exist. Not having any, is NOT
279 // ever a problem. 279 // ever a problem.
280 sceneObject.LoadScriptState(doc); 280 sceneObject.LoadScriptState(doc);
281 sceneObject.AggregatePerms(); 281// sceneObject.AggregatePerms();
282 return sceneObject; 282 return sceneObject;
283 } 283 }
284 catch (Exception e) 284 catch (Exception e)