aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Examples/SimpleApp2
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Examples/SimpleApp2')
-rw-r--r--OpenSim/Examples/SimpleApp2/Program.cs21
-rw-r--r--OpenSim/Examples/SimpleApp2/SimpleApp2.csproj53
-rw-r--r--OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build1
3 files changed, 52 insertions, 23 deletions
diff --git a/OpenSim/Examples/SimpleApp2/Program.cs b/OpenSim/Examples/SimpleApp2/Program.cs
index 88b7b17..85ce703 100644
--- a/OpenSim/Examples/SimpleApp2/Program.cs
+++ b/OpenSim/Examples/SimpleApp2/Program.cs
@@ -20,6 +20,7 @@ namespace SimpleApp2
20 private ConsoleBase m_console; 20 private ConsoleBase m_console;
21 private RegionInfo m_regionInfo; 21 private RegionInfo m_regionInfo;
22 private float[] m_map; 22 private float[] m_map;
23 private AuthenticateSessionsBase m_circuitManager;
23 24
24 private void Run() 25 private void Run()
25 { 26 {
@@ -34,10 +35,11 @@ namespace SimpleApp2
34 string simAddr = "127.0.0.1"; 35 string simAddr = "127.0.0.1";
35 int simPort = 9000; 36 int simPort = 9000;
36 37
38 m_circuitManager = new AuthenticateSessionsBase();
39
37 LoginServer loginServer = new LoginServer(simAddr, simPort, 0, 0, false); 40 LoginServer loginServer = new LoginServer(simAddr, simPort, 0, 0, false);
38 loginServer.Startup(); 41 loginServer.Startup();
39 42
40 AuthenticateSessionsBase localSessions = new AuthenticateSessionsBase();
41 loginServer.SetSessionHandler( AddNewSessionHandler ); 43 loginServer.SetSessionHandler( AddNewSessionHandler );
42 44
43 InventoryCache inventoryCache = new InventoryCache(); 45 InventoryCache inventoryCache = new InventoryCache();
@@ -48,7 +50,7 @@ namespace SimpleApp2
48 50
49 AssetCache assetCache = new AssetCache(assetServer); 51 AssetCache assetCache = new AssetCache(assetServer);
50 52
51 UDPServer udpServer = new UDPServer(simPort, assetCache, inventoryCache, m_console, localSessions); 53 UDPServer udpServer = new UDPServer(simPort, assetCache, inventoryCache, m_console, m_circuitManager );
52 PacketServer packetServer = new MyPacketServer(m_map, udpServer, (uint) simPort ); 54 PacketServer packetServer = new MyPacketServer(m_map, udpServer, (uint) simPort );
53 udpServer.ServerListener(); 55 udpServer.ServerListener();
54 56
@@ -89,6 +91,20 @@ namespace SimpleApp2
89 private bool AddNewSessionHandler(ulong regionHandle, Login loginData) 91 private bool AddNewSessionHandler(ulong regionHandle, Login loginData)
90 { 92 {
91 m_console.WriteLine(LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last); 93 m_console.WriteLine(LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last);
94
95 AgentCircuitData agent = new AgentCircuitData();
96 agent.AgentID = loginData.Agent;
97 agent.firstname = loginData.First;
98 agent.lastname = loginData.Last;
99 agent.SessionID = loginData.Session;
100 agent.SecureSessionID = loginData.SecureSession;
101 agent.circuitcode = loginData.CircuitCode;
102 agent.BaseFolder = loginData.BaseFolder;
103 agent.InventoryFolder = loginData.InventoryFolder;
104 agent.startpos = new LLVector3(128, 128, 70);
105
106 m_circuitManager.AddNewCircuit(agent.circuitcode, agent);
107
92 return true; 108 return true;
93 } 109 }
94 110
@@ -99,6 +115,7 @@ namespace SimpleApp2
99 app.Run(); 115 app.Run();
100 } 116 }
101 117
118
102 #region IWorld Members 119 #region IWorld Members
103 120
104 void IWorld.AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child) 121 void IWorld.AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child)
diff --git a/OpenSim/Examples/SimpleApp2/SimpleApp2.csproj b/OpenSim/Examples/SimpleApp2/SimpleApp2.csproj
index 404cb55..5c6e192 100644
--- a/OpenSim/Examples/SimpleApp2/SimpleApp2.csproj
+++ b/OpenSim/Examples/SimpleApp2/SimpleApp2.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
6 <ProjectGuid>{24DF2448-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{24DF2448-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon>
10 </ApplicationIcon>
10 <AssemblyKeyContainerName> 11 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 12 </AssemblyKeyContainerName>
12 <AssemblyName>SimpleApp2</AssemblyName> 13 <AssemblyName>SimpleApp2</AssemblyName>
@@ -15,9 +16,11 @@
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 17 <DelaySign>false</DelaySign>
17 <OutputType>Exe</OutputType> 18 <OutputType>Exe</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 19 <AppDesignerFolder>
20 </AppDesignerFolder>
19 <RootNamespace>SimpleApp2</RootNamespace> 21 <RootNamespace>SimpleApp2</RootNamespace>
20 <StartupObject></StartupObject> 22 <StartupObject>
23 </StartupObject>
21 <FileUpgradeFlags> 24 <FileUpgradeFlags>
22 </FileUpgradeFlags> 25 </FileUpgradeFlags>
23 </PropertyGroup> 26 </PropertyGroup>
@@ -28,7 +31,8 @@
28 <ConfigurationOverrideFile> 31 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 32 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants> 33 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 34 <DocumentationFile>
35 </DocumentationFile>
32 <DebugSymbols>True</DebugSymbols> 36 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 37 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 38 <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 43 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 44 <NoWarn>
45 </NoWarn>
41 </PropertyGroup> 46 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,31 +51,37 @@
46 <ConfigurationOverrideFile> 51 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 52 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants> 53 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 54 <DocumentationFile>
55 </DocumentationFile>
50 <DebugSymbols>False</DebugSymbols> 56 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 57 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 58 <Optimize>True</Optimize>
53 <OutputPath>bin\</OutputPath> 59 <OutputPath>..\..\..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop> 60 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 63 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 64 <NoWarn>
65 </NoWarn>
59 </PropertyGroup> 66 </PropertyGroup>
60 <ItemGroup> 67 <ItemGroup>
61 <Reference Include="libsecondlife.dll" > 68 <Reference Include="libsecondlife.dll">
62 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> 69 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
63 <Private>False</Private> 70 <Private>False</Private>
64 </Reference> 71 </Reference>
65 <Reference Include="System" > 72 <Reference Include="OpenSim.World">
73 <HintPath>OpenSim.World.dll</HintPath>
74 <Private>False</Private>
75 </Reference>
76 <Reference Include="System">
66 <HintPath>System.dll</HintPath> 77 <HintPath>System.dll</HintPath>
67 <Private>False</Private> 78 <Private>False</Private>
68 </Reference> 79 </Reference>
69 <Reference Include="System.Data.dll" > 80 <Reference Include="System.Data.dll">
70 <HintPath>..\..\..\bin\System.Data.dll</HintPath> 81 <HintPath>..\..\..\bin\System.Data.dll</HintPath>
71 <Private>False</Private> 82 <Private>False</Private>
72 </Reference> 83 </Reference>
73 <Reference Include="System.Xml" > 84 <Reference Include="System.Xml">
74 <HintPath>System.Xml.dll</HintPath> 85 <HintPath>System.Xml.dll</HintPath>
75 <Private>False</Private> 86 <Private>False</Private>
76 </Reference> 87 </Reference>
@@ -80,43 +91,43 @@
80 <Name>OpenSim.Caches</Name> 91 <Name>OpenSim.Caches</Name>
81 <Project>{1938EB12-0000-0000-0000-000000000000}</Project> 92 <Project>{1938EB12-0000-0000-0000-000000000000}</Project>
82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 93 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
83 <Private>False</Private> 94 <Private>False</Private>
84 </ProjectReference> 95 </ProjectReference>
85 <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> 96 <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
86 <Name>OpenSim.Framework</Name> 97 <Name>OpenSim.Framework</Name>
87 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 98 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
88 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 99 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
89 <Private>False</Private> 100 <Private>False</Private>
90 </ProjectReference> 101 </ProjectReference>
91 <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 102 <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
92 <Name>OpenSim.Framework.Console</Name> 103 <Name>OpenSim.Framework.Console</Name>
93 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 104 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
94 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 105 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
95 <Private>False</Private> 106 <Private>False</Private>
96 </ProjectReference> 107 </ProjectReference>
97 <ProjectReference Include="..\..\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj"> 108 <ProjectReference Include="..\..\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj">
98 <Name>OpenSim.GridInterfaces.Local</Name> 109 <Name>OpenSim.GridInterfaces.Local</Name>
99 <Project>{546099CD-0000-0000-0000-000000000000}</Project> 110 <Project>{546099CD-0000-0000-0000-000000000000}</Project>
100 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 111 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
101 <Private>False</Private> 112 <Private>False</Private>
102 </ProjectReference> 113 </ProjectReference>
103 <ProjectReference Include="..\..\OpenSim.RegionServer\OpenSim.RegionServer.csproj"> 114 <ProjectReference Include="..\..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
104 <Name>OpenSim.RegionServer</Name> 115 <Name>OpenSim.RegionServer</Name>
105 <Project>{632E1BFD-0000-0000-0000-000000000000}</Project> 116 <Project>{632E1BFD-0000-0000-0000-000000000000}</Project>
106 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 117 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
107 <Private>False</Private> 118 <Private>False</Private>
108 </ProjectReference> 119 </ProjectReference>
109 <ProjectReference Include="..\..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> 120 <ProjectReference Include="..\..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">
110 <Name>OpenSim.Servers</Name> 121 <Name>OpenSim.Servers</Name>
111 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> 122 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
112 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 123 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
113 <Private>False</Private> 124 <Private>False</Private>
114 </ProjectReference> 125 </ProjectReference>
115 <ProjectReference Include="..\..\..\Common\XmlRpcCS\XMLRPC.csproj"> 126 <ProjectReference Include="..\..\..\Common\XmlRpcCS\XMLRPC.csproj">
116 <Name>XMLRPC</Name> 127 <Name>XMLRPC</Name>
117 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> 128 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
118 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 129 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
119 <Private>False</Private> 130 <Private>False</Private>
120 </ProjectReference> 131 </ProjectReference>
121 </ItemGroup> 132 </ItemGroup>
122 <ItemGroup> 133 <ItemGroup>
@@ -140,4 +151,4 @@
140 <PostBuildEvent> 151 <PostBuildEvent>
141 </PostBuildEvent> 152 </PostBuildEvent>
142 </PropertyGroup> 153 </PropertyGroup>
143</Project> 154</Project> \ No newline at end of file
diff --git a/OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build b/OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build
index 8116f04..dc5cc2a 100644
--- a/OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build
+++ b/OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build
@@ -28,6 +28,7 @@
28 <include name="../../../bin/OpenSim.GridInterfaces.Local.dll" /> 28 <include name="../../../bin/OpenSim.GridInterfaces.Local.dll" />
29 <include name="../../../bin/OpenSim.RegionServer.dll" /> 29 <include name="../../../bin/OpenSim.RegionServer.dll" />
30 <include name="../../../bin/OpenSim.Servers.dll" /> 30 <include name="../../../bin/OpenSim.Servers.dll" />
31 <include name="OpenSim.World.dll" />
31 <include name="System.dll" /> 32 <include name="System.dll" />
32 <include name="System.Data.dll.dll" /> 33 <include name="System.Data.dll.dll" />
33 <include name="System.Xml.dll" /> 34 <include name="System.Xml.dll" />