From fa8f143aec69e36ee90fb34e2f144733b66ca951 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Sat, 9 Jun 2007 21:04:13 +0000
Subject: *Reorganized RegionServerCommsManager for OGS and local support
---
.../OpenSim.RegionServer.csproj | 8 ++++----
.../OpenSim.RegionServer.dll.build | 4 ++--
.../OpenSim.Storage.LocalStorageDb4o.csproj | 4 ++--
.../OpenSim.Storage.LocalStorageDb4o.dll.build | 2 +-
OpenSim/OpenSim.World/OpenSim.World.csproj | 22 +++++++++++-----------
OpenSim/OpenSim.World/World.cs | 6 +++---
OpenSim/OpenSim/OpenSimMain.cs | 6 +++---
7 files changed, 26 insertions(+), 26 deletions(-)
(limited to 'OpenSim')
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index fa91d7d..2fc6516 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -145,10 +145,10 @@
Code
-
+
Code
-
+
Code
@@ -169,10 +169,10 @@
Code
-
+
Code
-
+
Code
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index fc33eb9..c988025 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -18,16 +18,16 @@
+
-
-
+
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
index 7d90947..af8285b 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
@@ -96,10 +96,10 @@
Code
-
+
Code
-
+
Code
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index 9789712..72aac2a 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -13,8 +13,8 @@
-
+
diff --git a/OpenSim/OpenSim.World/OpenSim.World.csproj b/OpenSim/OpenSim.World/OpenSim.World.csproj
index 90e455a..f2fb596 100644
--- a/OpenSim/OpenSim.World/OpenSim.World.csproj
+++ b/OpenSim/OpenSim.World/OpenSim.World.csproj
@@ -130,33 +130,33 @@
-
- Code
-
Code
Code
-
+
Code
Code
-
- Code
-
Code
-
+
Code
Code
+
+ Code
+
+
+ Code
+
Code
@@ -166,6 +166,9 @@
Code
+
+ Code
+
Code
@@ -190,9 +193,6 @@
Code
-
- Code
-
diff --git a/OpenSim/OpenSim.World/World.cs b/OpenSim/OpenSim.World/World.cs
index 3e74501..011e39a 100644
--- a/OpenSim/OpenSim.World/World.cs
+++ b/OpenSim/OpenSim.World/World.cs
@@ -524,7 +524,7 @@ namespace OpenSim.world
protected void InformClientOfNeighbours(IClientAPI remoteClient)
{
// Console.WriteLine("informing client of neighbouring regions");
- List neighbours = this.commsManager.RequestNeighbours(this.m_regInfo);
+ List neighbours = this.commsManager.gridServer.RequestNeighbours(this.m_regInfo);
//Console.WriteLine("we have " + neighbours.Count + " neighbouring regions");
if (neighbours != null)
@@ -536,7 +536,7 @@ namespace OpenSim.world
agent.BaseFolder = LLUUID.Zero;
agent.InventoryFolder = LLUUID.Zero;
agent.startpos = new LLVector3(128, 128, 70);
- this.commsManager.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent);
+ this.commsManager.gridServer.InformNeighbourOfChildAgent(neighbours[i].RegionHandle, agent);
remoteClient.InformClientOfNeighbour(neighbours[i].RegionHandle, System.Net.IPAddress.Parse(neighbours[i].IPListenAddr), (ushort)neighbours[i].IPListenPort);
}
}
@@ -594,7 +594,7 @@ namespace OpenSim.world
public void RegisterRegionWithComms()
{
- this.regionCommsHost = this.commsManager.RegisterRegion(this.m_regInfo);
+ this.regionCommsHost = this.commsManager.gridServer.RegisterRegion(this.m_regInfo);
if (this.regionCommsHost != null)
{
this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection);
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index 1864e06..1174455 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -103,12 +103,12 @@ namespace OpenSim
this.SetupLocalGridServers();
this.checkServer = new CheckSumServer(12036);
this.checkServer.ServerListener();
- this.commsManager = new TestLocalCommsManager();
+ this.commsManager = new RegionServerCommsOGS();
}
else
{
this.SetupRemoteGridServers();
- this.commsManager = new TestLocalCommsManager(); //should be a remote comms manager class
+ this.commsManager = new RegionServerCommsLocal();
}
startuptime = DateTime.Now;
@@ -131,7 +131,7 @@ namespace OpenSim
loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, false);
loginServer.Startup();
//loginServer.SetSessionHandler(((AuthenticateSessionsLocal)this.AuthenticateSessionsHandler[0]).AddNewSession);
- loginServer.SetSessionHandler(((TestLocalCommsManager)this.commsManager).AddNewSession);
+ loginServer.SetSessionHandler(((RegionServerCommsLocal)this.commsManager).gridServer.AddNewSession);
//sandbox mode with loginserver not using accounts
httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod);
}
--
cgit v1.1