From 7bc28e0571947a90e85372df15e87099effa955d Mon Sep 17 00:00:00 2001 From: MW Date: Sat, 1 Dec 2007 14:25:46 +0000 Subject: [PATCH] the fix, so that trunk works again --- OpenSim/Region/Environment/Scenes/Scene.cs | 5 ----- OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 39f162040b..ade0e35a6b 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -1137,11 +1137,6 @@ namespace OpenSim.Region.Environment.Scenes /// public void RegisterCommsEvents() { - // Don't register here. babblefro moved registration to *after *the map - // functions on line 675 so that a proper map will generate and get sent to grid services - // Double registrations will cause inter region communication issues - - //m_sceneGridService.RegisterRegion(m_regInfo); m_sceneGridService.OnExpectUser += NewUserConnection; m_sceneGridService.OnAvatarCrossingIntoRegion += AgentCrossing; m_sceneGridService.OnCloseAgentConnection += CloseConnection; diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs index 77a287a6ca..14c43808a1 100644 --- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs @@ -55,6 +55,7 @@ namespace SimpleApp public event RezObject OnRezObject; public event ModifyTerrain OnModifyTerrain; public event SetAppearance OnSetAppearance; + public event AvatarNowWearing OnAvatarNowWearing; public event StartAnim OnStartAnim; public event LinkObjects OnLinkObjects; public event DelinkObjects OnDelinkObjects;