diff options
| author | Melanie | 2013-09-16 22:32:53 +0100 |
|---|---|---|
| committer | Melanie | 2013-09-16 22:32:53 +0100 |
| commit | 72206a0e294865bf0c93ea16910276a188d51ce6 (patch) | |
| tree | f7769826d78863b2e0e416fe529f0c55065e0acd /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Mono 2.0 fix - call ToArray() explicitly (diff) | |
| download | opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.zip opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.tar.gz opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.tar.bz2 opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.tar.xz | |
Merge branch 'avination-current' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 18e7eb8..d6d2df4 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2820,8 +2820,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2820 | newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject)); | 2820 | newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject)); |
| 2821 | newObject.ResumeScripts(); | 2821 | newObject.ResumeScripts(); |
| 2822 | 2822 | ||
| 2823 | if (newObject.RootPart.KeyframeMotion != null) | 2823 | // AddSceneObject already does this and doing it again messes |
| 2824 | newObject.RootPart.KeyframeMotion.UpdateSceneObject(newObject); | 2824 | // up region crossings, so don't. |
| 2825 | //if (newObject.RootPart.KeyframeMotion != null) | ||
| 2826 | // newObject.RootPart.KeyframeMotion.UpdateSceneObject(newObject); | ||
| 2825 | } | 2827 | } |
| 2826 | 2828 | ||
| 2827 | // Do this as late as possible so that listeners have full access to the incoming object | 2829 | // Do this as late as possible so that listeners have full access to the incoming object |