diff options
| author | UbitUmarov | 2017-05-04 12:57:11 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-04 12:57:11 +0100 |
| commit | 5f5b7e56dbff9acbd57506db852160761613556e (patch) | |
| tree | a2de12fc323878ad393d952fa2ab7cc3a5d55a9c /OpenSim/Region/Framework/Scenes/Serialization | |
| parent | viewer can't tell if a taskitem is group owned if we don't tell him; (diff) | |
| parent | the new options i add where actually bad idea, they would make the (diff) | |
| download | opensim-SC-5f5b7e56dbff9acbd57506db852160761613556e.zip opensim-SC-5f5b7e56dbff9acbd57506db852160761613556e.tar.gz opensim-SC-5f5b7e56dbff9acbd57506db852160761613556e.tar.bz2 opensim-SC-5f5b7e56dbff9acbd57506db852160761613556e.tar.xz | |
merge fix
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs | 2 |
2 files changed, 3 insertions, 3 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) |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs index 0f022dd..34fdb6d 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs | |||
| @@ -70,7 +70,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
| 70 | //obj.RegenerateFullIDs(); | 70 | //obj.RegenerateFullIDs(); |
| 71 | 71 | ||
| 72 | scene.AddNewSceneObject(obj, true); | 72 | scene.AddNewSceneObject(obj, true); |
| 73 | obj.AggregateDeepPerms(); | 73 | obj.InvalidateDeepEffectivePerms(); |
| 74 | } | 74 | } |
| 75 | } | 75 | } |
| 76 | else | 76 | else |