aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-05-31 11:28:11 +0000
committerMW2007-05-31 11:28:11 +0000
commitc35d360d44b639e96e900ef0901ae534f2f6d8c6 (patch)
treecce40adc3bb871e49d7cee1508dea574aba2399c
parentAdded a few summary comments to OpenSim.World files (diff)
downloadopensim-SC-c35d360d44b639e96e900ef0901ae534f2f6d8c6.zip
opensim-SC-c35d360d44b639e96e900ef0901ae534f2f6d8c6.tar.gz
opensim-SC-c35d360d44b639e96e900ef0901ae534f2f6d8c6.tar.bz2
opensim-SC-c35d360d44b639e96e900ef0901ae534f2f6d8c6.tar.xz
Started work on OpenGrid.Framework.Communications
Diffstat (limited to '')
-rw-r--r--Common/OpenGrid.Framework.Communications/CommsManager.cs33
-rw-r--r--Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj53
-rw-r--r--Common/OpenGrid.Framework.Communications/Properties/AssemblyInfo.cs35
-rw-r--r--Common/OpenSim.Framework/AuthenticateSessionBase.cs105
-rw-r--r--Common/OpenSim.Framework/IRegionCommsHost.cs13
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.csproj2
-rw-r--r--OpenSim.sln6
-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
15 files changed, 260 insertions, 4 deletions
diff --git a/Common/OpenGrid.Framework.Communications/CommsManager.cs b/Common/OpenGrid.Framework.Communications/CommsManager.cs
new file mode 100644
index 0000000..0cc2253
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/CommsManager.cs
@@ -0,0 +1,33 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.Framework;
5using OpenSim.Framework.Interfaces;
6using OpenSim.Framework.Types;
7
8namespace OpenGrid.Framework.Communications
9{
10 public class CommsManager
11 {
12
13 public CommsManager()
14 {
15
16 }
17
18 /// <summary>
19 ///
20 /// </summary>
21 /// <param name="regionInfo"></param>
22 /// <returns></returns>
23 public virtual IRegionCommsHost RegisterRegion(RegionInfo regionInfo)
24 {
25 return null;
26 }
27
28 public virtual bool InformNeighbourChildAgent()
29 {
30 return false;
31 }
32 }
33}
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
new file mode 100644
index 0000000..b53a868
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj
@@ -0,0 +1,53 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ProductVersion>8.0.50727</ProductVersion>
6 <SchemaVersion>2.0</SchemaVersion>
7 <ProjectGuid>{C9702041-922C-452A-A1B4-7880AF53149A}</ProjectGuid>
8 <OutputType>Library</OutputType>
9 <AppDesignerFolder>Properties</AppDesignerFolder>
10 <RootNamespace>OpenGrid.Framework.Communications</RootNamespace>
11 <AssemblyName>OpenGrid.Framework.Communications</AssemblyName>
12 </PropertyGroup>
13 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
14 <DebugSymbols>true</DebugSymbols>
15 <DebugType>full</DebugType>
16 <Optimize>false</Optimize>
17 <OutputPath>bin\Debug\</OutputPath>
18 <DefineConstants>DEBUG;TRACE</DefineConstants>
19 <ErrorReport>prompt</ErrorReport>
20 <WarningLevel>4</WarningLevel>
21 </PropertyGroup>
22 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
23 <DebugType>pdbonly</DebugType>
24 <Optimize>true</Optimize>
25 <OutputPath>bin\Release\</OutputPath>
26 <DefineConstants>TRACE</DefineConstants>
27 <ErrorReport>prompt</ErrorReport>
28 <WarningLevel>4</WarningLevel>
29 </PropertyGroup>
30 <ItemGroup>
31 <Reference Include="System" />
32 <Reference Include="System.Data" />
33 <Reference Include="System.Xml" />
34 </ItemGroup>
35 <ItemGroup>
36 <Compile Include="CommsManager.cs" />
37 <Compile Include="Properties\AssemblyInfo.cs" />
38 </ItemGroup>
39 <ItemGroup>
40 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
41 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
42 <Name>OpenSim.Framework</Name>
43 </ProjectReference>
44 </ItemGroup>
45 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
46 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
47 Other similar extension points exist, see Microsoft.Common.targets.
48 <Target Name="BeforeBuild">
49 </Target>
50 <Target Name="AfterBuild">
51 </Target>
52 -->
53</Project> \ No newline at end of file
diff --git a/Common/OpenGrid.Framework.Communications/Properties/AssemblyInfo.cs b/Common/OpenGrid.Framework.Communications/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..90693d5
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly.
8[assembly: AssemblyTitle("OpenGrid.Framework.Communications")]
9[assembly: AssemblyDescription("")]
10[assembly: AssemblyConfiguration("")]
11[assembly: AssemblyCompany("")]
12[assembly: AssemblyProduct("OpenGrid.Framework.Communications")]
13[assembly: AssemblyCopyright("Copyright © 2007")]
14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")]
16
17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)]
21
22// The following GUID is for the ID of the typelib if this project is exposed to COM
23[assembly: Guid("13e7c396-78a9-4a5c-baf2-6f980ea75d95")]
24
25// Version information for an assembly consists of the following four values:
26//
27// Major Version
28// Minor Version
29// Build Number
30// Revision
31//
32// You can specify all the values or you can default the Revision and Build Numbers
33// by using the '*' as shown below:
34[assembly: AssemblyVersion("1.0.0.0")]
35[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Common/OpenSim.Framework/AuthenticateSessionBase.cs b/Common/OpenSim.Framework/AuthenticateSessionBase.cs
new file mode 100644
index 0000000..ca20478
--- /dev/null
+++ b/Common/OpenSim.Framework/AuthenticateSessionBase.cs
@@ -0,0 +1,105 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife;
5using OpenSim.Framework.Interfaces;
6using OpenSim.Framework.Types;
7
8namespace OpenSim.Framework
9{
10 public class AuthenticateSessionsBase
11 {
12 public Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>();
13
14 public AuthenticateSessionsBase()
15 {
16
17 }
18
19 public virtual AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitcode)
20 {
21 AgentCircuitData validcircuit = null;
22 if (this.AgentCircuits.ContainsKey(circuitcode))
23 {
24 validcircuit = this.AgentCircuits[circuitcode];
25 }
26 AuthenticateResponse user = new AuthenticateResponse();
27 if (validcircuit == null)
28 {
29 //don't have this circuit code in our list
30 user.Authorised = false;
31 return (user);
32 }
33
34 if ((sessionID == validcircuit.SessionID) && (agentID == validcircuit.AgentID))
35 {
36 user.Authorised = true;
37 user.LoginInfo = new Login();
38 user.LoginInfo.Agent = agentID;
39 user.LoginInfo.Session = sessionID;
40 user.LoginInfo.SecureSession = validcircuit.SecureSessionID;
41 user.LoginInfo.First = validcircuit.firstname;
42 user.LoginInfo.Last = validcircuit.lastname;
43 user.LoginInfo.InventoryFolder = validcircuit.InventoryFolder;
44 user.LoginInfo.BaseFolder = validcircuit.BaseFolder;
45 }
46 else
47 {
48 // Invalid
49 user.Authorised = false;
50 }
51
52 return (user);
53 }
54
55 public virtual void AddNewCircuit(uint circuitCode, AgentCircuitData agentData)
56 {
57 if (this.AgentCircuits.ContainsKey(circuitCode))
58 {
59 this.AgentCircuits[circuitCode] = agentData;
60 }
61 else
62 {
63 this.AgentCircuits.Add(circuitCode, agentData);
64 }
65 }
66
67 public LLVector3 GetPosition(uint circuitCode)
68 {
69 LLVector3 vec = new LLVector3();
70 if (this.AgentCircuits.ContainsKey(circuitCode))
71 {
72 vec = this.AgentCircuits[circuitCode].startpos;
73 }
74 return vec;
75 }
76
77 public void UpdateAgentData(AgentCircuitData agentData)
78 {
79 if (this.AgentCircuits.ContainsKey((uint)agentData.circuitcode))
80 {
81 this.AgentCircuits[(uint)agentData.circuitcode].firstname = agentData.firstname;
82 this.AgentCircuits[(uint)agentData.circuitcode].lastname = agentData.lastname;
83 this.AgentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos;
84 // Console.WriteLine("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
85 }
86 }
87
88 public void UpdateAgentChildStatus(uint circuitcode, bool childstatus)
89 {
90 if (this.AgentCircuits.ContainsKey(circuitcode))
91 {
92 this.AgentCircuits[circuitcode].child = childstatus;
93 }
94 }
95
96 public bool GetAgentChildStatus(uint circuitcode)
97 {
98 if (this.AgentCircuits.ContainsKey(circuitcode))
99 {
100 return this.AgentCircuits[circuitcode].child;
101 }
102 return false;
103 }
104 }
105} \ No newline at end of file
diff --git a/Common/OpenSim.Framework/IRegionCommsHost.cs b/Common/OpenSim.Framework/IRegionCommsHost.cs
new file mode 100644
index 0000000..367ecfc
--- /dev/null
+++ b/Common/OpenSim.Framework/IRegionCommsHost.cs
@@ -0,0 +1,13 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.Framework
6{
7 public delegate void ExpectUserDelegate();
8
9 public interface IRegionCommsHost
10 {
11 event ExpectUserDelegate ExpectUser;
12 }
13}
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index 6c2a8c6..f83cb9d 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -99,9 +99,11 @@
99 <Compile Include="AgentInventory.cs"> 99 <Compile Include="AgentInventory.cs">
100 <SubType>Code</SubType> 100 <SubType>Code</SubType>
101 </Compile> 101 </Compile>
102 <Compile Include="AuthenticateSessionBase.cs" />
102 <Compile Include="BlockingQueue.cs"> 103 <Compile Include="BlockingQueue.cs">
103 <SubType>Code</SubType> 104 <SubType>Code</SubType>
104 </Compile> 105 </Compile>
106 <Compile Include="IRegionCommsHost.cs" />
105 <Compile Include="LoginService.cs"> 107 <Compile Include="LoginService.cs">
106 <SubType>Code</SubType> 108 <SubType>Code</SubType>
107 </Compile> 109 </Compile>
diff --git a/OpenSim.sln b/OpenSim.sln
index 0d4074b..2a00e9f 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -38,6 +38,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Loca
38EndProject 38EndProject
39Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" 39Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}"
40EndProject 40EndProject
41Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Communications", "Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj", "{C9702041-922C-452A-A1B4-7880AF53149A}"
42EndProject
41Global 43Global
42 GlobalSection(SolutionConfigurationPlatforms) = preSolution 44 GlobalSection(SolutionConfigurationPlatforms) = preSolution
43 Debug|Any CPU = Debug|Any CPU 45 Debug|Any CPU = Debug|Any CPU
@@ -120,6 +122,10 @@ Global
120 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 122 {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
121 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 123 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
122 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 124 {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
125 {C9702041-922C-452A-A1B4-7880AF53149A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
126 {C9702041-922C-452A-A1B4-7880AF53149A}.Debug|Any CPU.Build.0 = Debug|Any CPU
127 {C9702041-922C-452A-A1B4-7880AF53149A}.Release|Any CPU.ActiveCfg = Release|Any CPU
128 {C9702041-922C-452A-A1B4-7880AF53149A}.Release|Any CPU.Build.0 = Release|Any CPU
123 EndGlobalSection 129 EndGlobalSection
124 GlobalSection(SolutionProperties) = preSolution 130 GlobalSection(SolutionProperties) = preSolution
125 HideSolutionNode = FALSE 131 HideSolutionNode = FALSE
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;
generated by cgit v1.1 at 2024-12-19 01:29:01 +0000