aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMW2007-12-01 14:25:46 +0000
committerMW2007-12-01 14:25:46 +0000
commit7bc28e0571947a90e85372df15e87099effa955d (patch)
tree9b9816183ce03b50f963f2c8cf3e81028fb5d7b2 /OpenSim/Region
parentPart 1 of a commit. This revision will not compile, part 2 will be added in a... (diff)
downloadopensim-SC_OLD-7bc28e0571947a90e85372df15e87099effa955d.zip
opensim-SC_OLD-7bc28e0571947a90e85372df15e87099effa955d.tar.gz
opensim-SC_OLD-7bc28e0571947a90e85372df15e87099effa955d.tar.bz2
opensim-SC_OLD-7bc28e0571947a90e85372df15e87099effa955d.tar.xz
the fix, so that trunk works again
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs5
-rw-r--r--OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs1
2 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 39f1620..ade0e35 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1137,11 +1137,6 @@ namespace OpenSim.Region.Environment.Scenes
1137 /// </summary> 1137 /// </summary>
1138 public void RegisterCommsEvents() 1138 public void RegisterCommsEvents()
1139 { 1139 {
1140 // Don't register here. babblefro moved registration to *after *the map
1141 // functions on line 675 so that a proper map will generate and get sent to grid services
1142 // Double registrations will cause inter region communication issues
1143
1144 //m_sceneGridService.RegisterRegion(m_regInfo);
1145 m_sceneGridService.OnExpectUser += NewUserConnection; 1140 m_sceneGridService.OnExpectUser += NewUserConnection;
1146 m_sceneGridService.OnAvatarCrossingIntoRegion += AgentCrossing; 1141 m_sceneGridService.OnAvatarCrossingIntoRegion += AgentCrossing;
1147 m_sceneGridService.OnCloseAgentConnection += CloseConnection; 1142 m_sceneGridService.OnCloseAgentConnection += CloseConnection;
diff --git a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
index 77a287a..14c4380 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyNpcCharacter.cs
@@ -55,6 +55,7 @@ namespace SimpleApp
55 public event RezObject OnRezObject; 55 public event RezObject OnRezObject;
56 public event ModifyTerrain OnModifyTerrain; 56 public event ModifyTerrain OnModifyTerrain;
57 public event SetAppearance OnSetAppearance; 57 public event SetAppearance OnSetAppearance;
58 public event AvatarNowWearing OnAvatarNowWearing;
58 public event StartAnim OnStartAnim; 59 public event StartAnim OnStartAnim;
59 public event LinkObjects OnLinkObjects; 60 public event LinkObjects OnLinkObjects;
60 public event DelinkObjects OnDelinkObjects; 61 public event DelinkObjects OnDelinkObjects;