aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2011-04-30 16:01:54 +0200
committerMelanie2011-04-30 16:20:20 +0100
commit99b35d3ca63bb5d1cd8d02087675b97c092c6ecb (patch)
treea1907486311dd21365fb8ff9bf2c6723e019f1ad /OpenSim/Region/Framework/Scenes
parentDelaying starting the scripts on TPs and crossings until the agent is root. (diff)
downloadopensim-SC_OLD-99b35d3ca63bb5d1cd8d02087675b97c092c6ecb.zip
opensim-SC_OLD-99b35d3ca63bb5d1cd8d02087675b97c092c6ecb.tar.gz
opensim-SC_OLD-99b35d3ca63bb5d1cd8d02087675b97c092c6ecb.tar.bz2
opensim-SC_OLD-99b35d3ca63bb5d1cd8d02087675b97c092c6ecb.tar.xz
When coming in from a legacy region without fatpacks, start scripts the
usual way
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs16
1 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 2cbe4dc..7c5e246 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2342,6 +2342,22 @@ namespace OpenSim.Region.Framework.Scenes
2342 newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject)); 2342 newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject));
2343 newObject.ResumeScripts(); 2343 newObject.ResumeScripts();
2344 } 2344 }
2345 else
2346 {
2347 ScenePresence sp;
2348 if (TryGetScenePresence(newObject.OwnerID, out sp))
2349 {
2350 // If the scene presence is here and already a root
2351 // agent, we came from a ;egacy region. Start the scripts
2352 // here as they used to start.
2353 // TODO: Remove in 0.7.3
2354 if (!sp.IsChildAgent)
2355 {
2356 newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject));
2357 newObject.ResumeScripts();
2358 }
2359 }
2360 }
2345 2361
2346 // Do this as late as possible so that listeners have full access to the incoming object 2362 // Do this as late as possible so that listeners have full access to the incoming object
2347 EventManager.TriggerOnIncomingSceneObject(newObject); 2363 EventManager.TriggerOnIncomingSceneObject(newObject);