From c35d360d44b639e96e900ef0901ae534f2f6d8c6 Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 31 May 2007 11:28:11 +0000
Subject: Started work on OpenGrid.Framework.Communications

---
 OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs   | 4 ++--
 OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs  | 1 +
 OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs | 1 +
 OpenSim/OpenSim.RegionServer/PacketServer.cs               | 1 +
 OpenSim/OpenSim.RegionServer/RegionServerBase.cs           | 1 +
 OpenSim/OpenSim.RegionServer/UDPServer.cs                  | 1 +
 OpenSim/OpenSim.World/World.cs                             | 5 ++++-
 OpenSim/OpenSim/OpenSimMain.cs                             | 3 ++-
 8 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs
index 99b86d4..a97ecdf 100644
--- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs
+++ b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs
@@ -7,7 +7,7 @@ using OpenSim.Framework.Types;
 
 namespace OpenSim
 {
-    public class AuthenticateSessionsBase
+   /* public class AuthenticateSessionsBase
     {
         public Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>();
 
@@ -101,5 +101,5 @@ namespace OpenSim
             }
             return false;
         }
-    }
+    }*/
 }
diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
index 6c1c7d2..91772f8 100644
--- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
+++ b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
 using OpenSim.Framework.Types;
+using OpenSim.Framework;
 
 namespace OpenSim
 {
diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
index 0802d75..80cd9d3 100644
--- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
+++ b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Xml;
 using libsecondlife;
 using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using Nwc.XmlRpc;
 
 namespace OpenSim
diff --git a/OpenSim/OpenSim.RegionServer/PacketServer.cs b/OpenSim/OpenSim.RegionServer/PacketServer.cs
index d40de47..0ab4a8d 100644
--- a/OpenSim/OpenSim.RegionServer/PacketServer.cs
+++ b/OpenSim/OpenSim.RegionServer/PacketServer.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife.Packets;
 using OpenSim.Framework.Interfaces;
+using OpenSim.Framework;
 using System.Net;
 using System.Net.Sockets;
 using OpenSim.Assets;
diff --git a/OpenSim/OpenSim.RegionServer/RegionServerBase.cs b/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
index 3b9c6e0..b7129c5 100644
--- a/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionServerBase.cs
@@ -13,6 +13,7 @@ using libsecondlife.Packets;
 using OpenSim.Terrain;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using OpenSim.UserServer;
 using OpenSim.Assets;
 using OpenSim.CAPS;
diff --git a/OpenSim/OpenSim.RegionServer/UDPServer.cs b/OpenSim/OpenSim.RegionServer/UDPServer.cs
index 8ec5af1..5d8c1d8 100644
--- a/OpenSim/OpenSim.RegionServer/UDPServer.cs
+++ b/OpenSim/OpenSim.RegionServer/UDPServer.cs
@@ -17,6 +17,7 @@ using OpenSim.UserServer;
 using OpenSim.Assets;
 using OpenSim.CAPS;
 using OpenSim.Framework.Console;
+using OpenSim.Framework;
 using Nwc.XmlRpc;
 using OpenSim.Servers;
 using OpenSim.GenericConfig;
diff --git a/OpenSim/OpenSim.World/World.cs b/OpenSim/OpenSim.World/World.cs
index 77af862..c731dbc 100644
--- a/OpenSim/OpenSim.World/World.cs
+++ b/OpenSim/OpenSim.World/World.cs
@@ -11,6 +11,7 @@ using OpenSim.Physics.Manager;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Inventory;
+using OpenSim.Framework;
 using OpenSim.RegionServer.world.scripting;
 using OpenSim.Terrain;
 
@@ -34,6 +35,7 @@ namespace OpenSim.world
         private Dictionary<string, ScriptFactory> m_scripts;
         private Mutex updateLock;
         public string m_datastore;
+        protected AuthenticateSessionsBase authenticateHandler;
 
         #region Properties
         /// <summary>
@@ -59,11 +61,12 @@ namespace OpenSim.world
         /// <param name="clientThreads">Dictionary to contain client threads</param>
         /// <param name="regionHandle">Region Handle for this region</param>
         /// <param name="regionName">Region Name for this region</param>
-        public World(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo)
+        public World(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen)
         {
             try
             {
                 updateLock = new Mutex(false);
+                this.authenticateHandler = authen;
                 m_clientThreads = clientThreads;
                 m_regInfo = regInfo;
                 m_regionHandle = m_regInfo.RegionHandle;
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index 0a30928..95b8e10 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -42,6 +42,7 @@ using OpenSim.world;
 using OpenSim.Terrain;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using OpenSim.UserServer;
 using OpenSim.Assets;
 using OpenSim.CAPS;
@@ -233,7 +234,7 @@ namespace OpenSim
                 m_console.componentname = "Region " + regionData.RegionName;
                 */
 
-                LocalWorld = new World(udpServer.PacketServer.ClientAPIs, regionDat);
+                LocalWorld = new World(udpServer.PacketServer.ClientAPIs, regionDat, authenBase);
                 this.m_localWorld.Add(LocalWorld);
                 //LocalWorld.InventoryCache = InventoryCache;
                 //LocalWorld.AssetCache = AssetCache;
-- 
cgit v1.1