Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
commit
b3594681a4
|
@ -2511,7 +2511,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
// Do this as late as possible so that listeners have full access to the incoming object
|
// Do this as late as possible so that listeners have full access to the incoming object
|
||||||
EventManager.TriggerOnIncomingSceneObject(newObject);
|
EventManager.TriggerOnIncomingSceneObject(newObject);
|
||||||
|
|
||||||
TriggerEventsOnScriptedAttachments(newObject);
|
TriggerChangedTeleport(newObject);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -2623,7 +2623,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void TriggerEventsOnScriptedAttachments(SceneObjectGroup sog)
|
private void TriggerChangedTeleport(SceneObjectGroup sog)
|
||||||
{
|
{
|
||||||
ScenePresence sp = GetScenePresence(sog.OwnerID);
|
ScenePresence sp = GetScenePresence(sog.OwnerID);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue