diff options
| author | UbitUmarov | 2014-07-16 16:22:32 +0100 |
|---|---|---|
| committer | UbitUmarov | 2014-07-16 16:22:32 +0100 |
| commit | 19d33c571d8f48501ecb2409814d5b95b2b4be23 (patch) | |
| tree | 8e08805a71ebea81de75b5805105f325e0defa0f /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Merge branch 'avination-current' into ubitwork (diff) | |
| parent | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster in... (diff) | |
| download | opensim-SC_OLD-19d33c571d8f48501ecb2409814d5b95b2b4be23.zip opensim-SC_OLD-19d33c571d8f48501ecb2409814d5b95b2b4be23.tar.gz opensim-SC_OLD-19d33c571d8f48501ecb2409814d5b95b2b4be23.tar.bz2 opensim-SC_OLD-19d33c571d8f48501ecb2409814d5b95b2b4be23.tar.xz | |
Merge branch 'avination-current' into ubitwork
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 2b58795..b189599 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2802,8 +2802,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2802 | newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject)); | 2802 | newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject)); |
| 2803 | newObject.ResumeScripts(); | 2803 | newObject.ResumeScripts(); |
| 2804 | 2804 | ||
| 2805 | if (newObject.RootPart.KeyframeMotion != null) | 2805 | // AddSceneObject already does this and doing it again messes |
| 2806 | newObject.RootPart.KeyframeMotion.UpdateSceneObject(newObject); | 2806 | // up region crossings, so don't. |
| 2807 | //if (newObject.RootPart.KeyframeMotion != null) | ||
| 2808 | // newObject.RootPart.KeyframeMotion.UpdateSceneObject(newObject); | ||
| 2807 | } | 2809 | } |
| 2808 | 2810 | ||
| 2809 | // Do this as late as possible so that listeners have full access to the incoming object | 2811 | // Do this as late as possible so that listeners have full access to the incoming object |