diff options
| author | Diva Canto | 2010-06-12 12:09:06 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-06-12 12:09:06 -0700 |
| commit | b3594681a45372209448527c65eb43853a691393 (patch) | |
| tree | 2b07b82bdb98a94ae0c24b2cbb1b26164ea544fe /OpenSim/Region/Framework | |
| parent | Added checks for failed UpdateAgent calls. (diff) | |
| parent | Change name of method to better reflect what it does (diff) | |
| download | opensim-SC_OLD-b3594681a45372209448527c65eb43853a691393.zip opensim-SC_OLD-b3594681a45372209448527c65eb43853a691393.tar.gz opensim-SC_OLD-b3594681a45372209448527c65eb43853a691393.tar.bz2 opensim-SC_OLD-b3594681a45372209448527c65eb43853a691393.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index bcfb4c9..55060c3 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2511,7 +2511,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2511 | // Do this as late as possible so that listeners have full access to the incoming object | 2511 | // Do this as late as possible so that listeners have full access to the incoming object |
| 2512 | EventManager.TriggerOnIncomingSceneObject(newObject); | 2512 | EventManager.TriggerOnIncomingSceneObject(newObject); |
| 2513 | 2513 | ||
| 2514 | TriggerEventsOnScriptedAttachments(newObject); | 2514 | TriggerChangedTeleport(newObject); |
| 2515 | 2515 | ||
| 2516 | return true; | 2516 | return true; |
| 2517 | } | 2517 | } |
| @@ -2623,7 +2623,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2623 | return true; | 2623 | return true; |
| 2624 | } | 2624 | } |
| 2625 | 2625 | ||
| 2626 | private void TriggerEventsOnScriptedAttachments(SceneObjectGroup sog) | 2626 | private void TriggerChangedTeleport(SceneObjectGroup sog) |
| 2627 | { | 2627 | { |
| 2628 | ScenePresence sp = GetScenePresence(sog.OwnerID); | 2628 | ScenePresence sp = GetScenePresence(sog.OwnerID); |
| 2629 | 2629 | ||