aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/OpenSim.RegionServer/AuthenticateSessionsBase.cs4
-rw-r--r--OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs1
-rw-r--r--OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs1
-rw-r--r--OpenSim/OpenSim.RegionServer/PacketServer.cs1
-rw-r--r--OpenSim/OpenSim.RegionServer/RegionServerBase.cs1
-rw-r--r--OpenSim/OpenSim.RegionServer/UDPServer.cs1
-rw-r--r--OpenSim/OpenSim.World/World.cs5
-rw-r--r--OpenSim/OpenSim/OpenSimMain.cs3
8 files changed, 13 insertions, 4 deletions
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;
7 7
8namespace OpenSim 8namespace OpenSim
9{ 9{
10 public class AuthenticateSessionsBase 10 /* public class AuthenticateSessionsBase
11 { 11 {
12 public Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>(); 12 public Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>();
13 13
@@ -101,5 +101,5 @@ namespace OpenSim
101 } 101 }
102 return false; 102 return false;
103 } 103 }
104 } 104 }*/
105} 105}
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;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5using OpenSim.Framework.Types; 5using OpenSim.Framework.Types;
6using OpenSim.Framework;
6 7
7namespace OpenSim 8namespace OpenSim
8{ 9{
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;
5using System.Xml; 5using System.Xml;
6using libsecondlife; 6using libsecondlife;
7using OpenSim.Framework.Types; 7using OpenSim.Framework.Types;
8using OpenSim.Framework;
8using Nwc.XmlRpc; 9using Nwc.XmlRpc;
9 10
10namespace OpenSim 11namespace 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;
3using System.Text; 3using System.Text;
4using libsecondlife.Packets; 4using libsecondlife.Packets;
5using OpenSim.Framework.Interfaces; 5using OpenSim.Framework.Interfaces;
6using OpenSim.Framework;
6using System.Net; 7using System.Net;
7using System.Net.Sockets; 8using System.Net.Sockets;
8using OpenSim.Assets; 9using 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;
13using OpenSim.Terrain; 13using OpenSim.Terrain;
14using OpenSim.Framework.Interfaces; 14using OpenSim.Framework.Interfaces;
15using OpenSim.Framework.Types; 15using OpenSim.Framework.Types;
16using OpenSim.Framework;
16using OpenSim.UserServer; 17using OpenSim.UserServer;
17using OpenSim.Assets; 18using OpenSim.Assets;
18using OpenSim.CAPS; 19using 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;
17using OpenSim.Assets; 17using OpenSim.Assets;
18using OpenSim.CAPS; 18using OpenSim.CAPS;
19using OpenSim.Framework.Console; 19using OpenSim.Framework.Console;
20using OpenSim.Framework;
20using Nwc.XmlRpc; 21using Nwc.XmlRpc;
21using OpenSim.Servers; 22using OpenSim.Servers;
22using OpenSim.GenericConfig; 23using 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;
11using OpenSim.Framework.Interfaces; 11using OpenSim.Framework.Interfaces;
12using OpenSim.Framework.Types; 12using OpenSim.Framework.Types;
13using OpenSim.Framework.Inventory; 13using OpenSim.Framework.Inventory;
14using OpenSim.Framework;
14using OpenSim.RegionServer.world.scripting; 15using OpenSim.RegionServer.world.scripting;
15using OpenSim.Terrain; 16using OpenSim.Terrain;
16 17
@@ -34,6 +35,7 @@ namespace OpenSim.world
34 private Dictionary<string, ScriptFactory> m_scripts; 35 private Dictionary<string, ScriptFactory> m_scripts;
35 private Mutex updateLock; 36 private Mutex updateLock;
36 public string m_datastore; 37 public string m_datastore;
38 protected AuthenticateSessionsBase authenticateHandler;
37 39
38 #region Properties 40 #region Properties
39 /// <summary> 41 /// <summary>
@@ -59,11 +61,12 @@ namespace OpenSim.world
59 /// <param name="clientThreads">Dictionary to contain client threads</param> 61 /// <param name="clientThreads">Dictionary to contain client threads</param>
60 /// <param name="regionHandle">Region Handle for this region</param> 62 /// <param name="regionHandle">Region Handle for this region</param>
61 /// <param name="regionName">Region Name for this region</param> 63 /// <param name="regionName">Region Name for this region</param>
62 public World(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo) 64 public World(Dictionary<uint, IClientAPI> clientThreads, RegionInfo regInfo, AuthenticateSessionsBase authen)
63 { 65 {
64 try 66 try
65 { 67 {
66 updateLock = new Mutex(false); 68 updateLock = new Mutex(false);
69 this.authenticateHandler = authen;
67 m_clientThreads = clientThreads; 70 m_clientThreads = clientThreads;
68 m_regInfo = regInfo; 71 m_regInfo = regInfo;
69 m_regionHandle = m_regInfo.RegionHandle; 72 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;
42using OpenSim.Terrain; 42using OpenSim.Terrain;
43using OpenSim.Framework.Interfaces; 43using OpenSim.Framework.Interfaces;
44using OpenSim.Framework.Types; 44using OpenSim.Framework.Types;
45using OpenSim.Framework;
45using OpenSim.UserServer; 46using OpenSim.UserServer;
46using OpenSim.Assets; 47using OpenSim.Assets;
47using OpenSim.CAPS; 48using OpenSim.CAPS;
@@ -233,7 +234,7 @@ namespace OpenSim
233 m_console.componentname = "Region " + regionData.RegionName; 234 m_console.componentname = "Region " + regionData.RegionName;
234 */ 235 */
235 236
236 LocalWorld = new World(udpServer.PacketServer.ClientAPIs, regionDat); 237 LocalWorld = new World(udpServer.PacketServer.ClientAPIs, regionDat, authenBase);
237 this.m_localWorld.Add(LocalWorld); 238 this.m_localWorld.Add(LocalWorld);
238 //LocalWorld.InventoryCache = InventoryCache; 239 //LocalWorld.InventoryCache = InventoryCache;
239 //LocalWorld.AssetCache = AssetCache; 240 //LocalWorld.AssetCache = AssetCache;