diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c28979e..0f23cc7 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2494,22 +2494,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2494 | newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject)); | 2494 | newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject)); |
2495 | newObject.ResumeScripts(); | 2495 | newObject.ResumeScripts(); |
2496 | } | 2496 | } |
2497 | else | ||
2498 | { | ||
2499 | ScenePresence sp; | ||
2500 | if (TryGetScenePresence(newObject.OwnerID, out sp)) | ||
2501 | { | ||
2502 | // If the scene presence is here and already a root | ||
2503 | // agent, we came from a ;egacy region. Start the scripts | ||
2504 | // here as they used to start. | ||
2505 | // TODO: Remove in 0.7.3 | ||
2506 | if (!sp.IsChildAgent) | ||
2507 | { | ||
2508 | newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject)); | ||
2509 | newObject.ResumeScripts(); | ||
2510 | } | ||
2511 | } | ||
2512 | } | ||
2513 | 2497 | ||
2514 | // Do this as late as possible so that listeners have full access to the incoming object | 2498 | // Do this as late as possible so that listeners have full access to the incoming object |
2515 | EventManager.TriggerOnIncomingSceneObject(newObject); | 2499 | EventManager.TriggerOnIncomingSceneObject(newObject); |