aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs24
-rw-r--r--Common/OpenSim.Framework/IRegionCommsHost.cs5
-rw-r--r--OpenSim/OpenSim.RegionServer/RegionServerBase.cs2
-rw-r--r--OpenSim/OpenSim/OpenSimMain.cs4
4 files changed, 30 insertions, 5 deletions
diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
index 960bbef..c5413d2 100644
--- a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
+++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs
@@ -18,6 +18,15 @@ namespace OpenGrid.Framework.Communications
18 /// <summary> 18 /// <summary>
19 /// 19 ///
20 /// </summary> 20 /// </summary>
21 /// <returns></returns>
22 public virtual RegionInfo LoadRegionConfigFromGridServer()
23 {
24 return null;
25 }
26
27 /// <summary>
28 ///
29 /// </summary>
21 /// <param name="regionInfo"></param> 30 /// <param name="regionInfo"></param>
22 /// <returns></returns> 31 /// <returns></returns>
23 public virtual IRegionCommsHost RegisterRegion(RegionInfo regionInfo) 32 public virtual IRegionCommsHost RegisterRegion(RegionInfo regionInfo)
@@ -25,7 +34,20 @@ namespace OpenGrid.Framework.Communications
25 return null; 34 return null;
26 } 35 }
27 36
28 public virtual bool InformNeighbourChildAgent() 37 /// <summary>
38 ///
39 /// </summary>
40 /// <returns></returns>
41 public virtual bool InformNeighbourOfChildAgent()
42 {
43 return false;
44 }
45
46 /// <summary>
47 ///
48 /// </summary>
49 /// <returns></returns>
50 public virtual bool AvatarCrossingToRegion()
29 { 51 {
30 return false; 52 return false;
31 } 53 }
diff --git a/Common/OpenSim.Framework/IRegionCommsHost.cs b/Common/OpenSim.Framework/IRegionCommsHost.cs
index 367ecfc..006661d 100644
--- a/Common/OpenSim.Framework/IRegionCommsHost.cs
+++ b/Common/OpenSim.Framework/IRegionCommsHost.cs
@@ -1,6 +1,7 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenSim.Framework.Interfaces;
4 5
5namespace OpenSim.Framework 6namespace OpenSim.Framework
6{ 7{
@@ -8,6 +9,8 @@ namespace OpenSim.Framework
8 9
9 public interface IRegionCommsHost 10 public interface IRegionCommsHost
10 { 11 {
11 event ExpectUserDelegate ExpectUser; 12 event ExpectUserDelegate OnExpectUser;
13 event GenericCall2 OnExpectChildAgent;
14 event GenericCall2 OnAvatarCrossingIntoRegion;
12 } 15 }
13} 16}
diff --git a/OpenSim/OpenSim.RegionServer/RegionServerBase.cs b/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
index b7129c5..e2e3512 100644
--- a/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
@@ -87,7 +87,7 @@ namespace OpenSim
87 87
88 } 88 }
89 89
90 protected virtual void SetupLocalWorld() 90 protected virtual void SetupWorld()
91 { 91 {
92 } 92 }
93 93
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index 95b8e10..7c3bca4 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -112,7 +112,7 @@ namespace OpenSim
112 this.physManager = new OpenSim.Physics.Manager.PhysicsManager(); 112 this.physManager = new OpenSim.Physics.Manager.PhysicsManager();
113 this.physManager.LoadPlugins(); 113 this.physManager.LoadPlugins();
114 114
115 this.SetupLocalWorld(); 115 this.SetupWorld();
116 116
117 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Initialising HTTP server"); 117 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Initialising HTTP server");
118 118
@@ -178,7 +178,7 @@ namespace OpenSim
178 } 178 }
179 } 179 }
180 180
181 protected override void SetupLocalWorld() 181 protected override void SetupWorld()
182 { 182 {
183 IGenericConfig regionConfig; 183 IGenericConfig regionConfig;
184 World LocalWorld; 184 World LocalWorld;