OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

the fix, so that trunk works again

afrisby
MW 2007-12-01 14:25:46 +00:00
parent 27f182ac54
commit 7bc28e0571
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -1137,11 +1137,6 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary> /// </summary>
public void RegisterCommsEvents() 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.OnExpectUser += NewUserConnection;
m_sceneGridService.OnAvatarCrossingIntoRegion += AgentCrossing; m_sceneGridService.OnAvatarCrossingIntoRegion += AgentCrossing;
m_sceneGridService.OnCloseAgentConnection += CloseConnection; m_sceneGridService.OnCloseAgentConnection += CloseConnection;

1
OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
View File

@ -55,6 +55,7 @@ namespace SimpleApp
public event RezObject OnRezObject; public event RezObject OnRezObject;
public event ModifyTerrain OnModifyTerrain; public event ModifyTerrain OnModifyTerrain;
public event SetAppearance OnSetAppearance; public event SetAppearance OnSetAppearance;
public event AvatarNowWearing OnAvatarNowWearing;
public event StartAnim OnStartAnim; public event StartAnim OnStartAnim;
public event LinkObjects OnLinkObjects; public event LinkObjects OnLinkObjects;
public event DelinkObjects OnDelinkObjects; public event DelinkObjects OnDelinkObjects;