aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJohn Hurliman2010-03-03 11:03:56 -0800
committerJohn Hurliman2010-03-03 11:03:56 -0800
commit94a3e60bd0b288e744f66347eafdaac70713a759 (patch)
treeb89e4144876f6990459733af0345a8cce6453f07 /OpenSim/Region/Framework
parent* Fixed bad start position clamping in MakeRootAgent() (diff)
parentActually make EventManager.OnAttach() fire when an object is attached. Previ... (diff)
downloadopensim-SC_OLD-94a3e60bd0b288e744f66347eafdaac70713a759.zip
opensim-SC_OLD-94a3e60bd0b288e744f66347eafdaac70713a759.tar.gz
opensim-SC_OLD-94a3e60bd0b288e744f66347eafdaac70713a759.tar.bz2
opensim-SC_OLD-94a3e60bd0b288e744f66347eafdaac70713a759.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneManager.cs2
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 369552f..b7fcd7d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -540,6 +540,9 @@ namespace OpenSim.Region.Framework.Scenes
540 // Fire after attach, so we don't get messy perms dialogs 540 // Fire after attach, so we don't get messy perms dialogs
541 // 3 == AttachedRez 541 // 3 == AttachedRez
542 objatt.CreateScriptInstances(0, true, m_parentScene.DefaultScriptEngine, 3); 542 objatt.CreateScriptInstances(0, true, m_parentScene.DefaultScriptEngine, 3);
543
544 // Do this last so that event listeners have access to all the effects of the attachment
545 m_parentScene.EventManager.TriggerOnAttach(objatt.LocalId, itemID, remoteClient.AgentId);
543 } 546 }
544 return objatt; 547 return objatt;
545 } 548 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index 6395d98..680c39a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -422,7 +422,7 @@ namespace OpenSim.Region.Framework.Scenes
422 422
423 if (!scenePresence.IsChildAgent) 423 if (!scenePresence.IsChildAgent)
424 { 424 {
425 m_log.ErrorFormat("Packet debug for {0} {1} set to {2}", 425 m_log.DebugFormat("Packet debug for {0} {1} set to {2}",
426 scenePresence.Firstname, 426 scenePresence.Firstname,
427 scenePresence.Lastname, 427 scenePresence.Lastname,
428 newDebug); 428 newDebug);