aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Examples/SimpleApp
diff options
context:
space:
mode:
authorlbsa712007-06-20 11:41:45 +0000
committerlbsa712007-06-20 11:41:45 +0000
commit8edcc844c443a8d2567d2ca1e468fa3324272b98 (patch)
tree3607faa8d44c72ff227e408cb315427aa2d32147 /OpenSim/Examples/SimpleApp
parentDeleted some bin/obj Directories. (diff)
downloadopensim-SC_OLD-8edcc844c443a8d2567d2ca1e468fa3324272b98.zip
opensim-SC_OLD-8edcc844c443a8d2567d2ca1e468fa3324272b98.tar.gz
opensim-SC_OLD-8edcc844c443a8d2567d2ca1e468fa3324272b98.tar.bz2
opensim-SC_OLD-8edcc844c443a8d2567d2ca1e468fa3324272b98.tar.xz
* re-added SimpleApp projects
* made them work (yay!) * some cleanup
Diffstat (limited to 'OpenSim/Examples/SimpleApp')
-rw-r--r--OpenSim/Examples/SimpleApp/Program.cs21
-rw-r--r--OpenSim/Examples/SimpleApp/SimpleApp.csproj6
-rw-r--r--OpenSim/Examples/SimpleApp/SimpleApp.exe.build1
3 files changed, 24 insertions, 4 deletions
diff --git a/OpenSim/Examples/SimpleApp/Program.cs b/OpenSim/Examples/SimpleApp/Program.cs
index ed1f063..1d0702d 100644
--- a/OpenSim/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Examples/SimpleApp/Program.cs
@@ -18,6 +18,7 @@ namespace SimpleApp
18 class Program : IAssetReceiver, conscmd_callback 18 class Program : IAssetReceiver, conscmd_callback
19 { 19 {
20 private ConsoleBase m_console; 20 private ConsoleBase m_console;
21 AuthenticateSessionsBase m_circuitManager;
21 22
22 private void Run() 23 private void Run()
23 { 24 {
@@ -34,7 +35,7 @@ namespace SimpleApp
34 loginServer.Startup(); 35 loginServer.Startup();
35 loginServer.SetSessionHandler( AddNewSessionHandler ); 36 loginServer.SetSessionHandler( AddNewSessionHandler );
36 37
37 AuthenticateSessionsBase localSessions = new AuthenticateSessionsBase(); 38 m_circuitManager = new AuthenticateSessionsBase();
38 39
39 InventoryCache inventoryCache = new InventoryCache(); 40 InventoryCache inventoryCache = new InventoryCache();
40 41
@@ -44,7 +45,7 @@ namespace SimpleApp
44 45
45 AssetCache assetCache = new AssetCache(assetServer); 46 AssetCache assetCache = new AssetCache(assetServer);
46 47
47 UDPServer udpServer = new UDPServer(simPort, assetCache, inventoryCache, m_console, localSessions ); 48 UDPServer udpServer = new UDPServer(simPort, assetCache, inventoryCache, m_console, m_circuitManager );
48 PacketServer packetServer = new PacketServer( udpServer, (uint) simPort ); 49 PacketServer packetServer = new PacketServer( udpServer, (uint) simPort );
49 udpServer.ServerListener(); 50 udpServer.ServerListener();
50 51
@@ -69,7 +70,21 @@ namespace SimpleApp
69 70
70 private bool AddNewSessionHandler(ulong regionHandle, Login loginData) 71 private bool AddNewSessionHandler(ulong regionHandle, Login loginData)
71 { 72 {
72 m_console.WriteLine( LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last ); 73 m_console.WriteLine(LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last);
74
75 AgentCircuitData agent = new AgentCircuitData();
76 agent.AgentID = loginData.Agent;
77 agent.firstname = loginData.First;
78 agent.lastname = loginData.Last;
79 agent.SessionID = loginData.Session;
80 agent.SecureSessionID = loginData.SecureSession;
81 agent.circuitcode = loginData.CircuitCode;
82 agent.BaseFolder = loginData.BaseFolder;
83 agent.InventoryFolder = loginData.InventoryFolder;
84 agent.startpos = new LLVector3(128, 128, 70);
85
86 m_circuitManager.AddNewCircuit(agent.circuitcode, agent);
87
73 return true; 88 return true;
74 } 89 }
75 90
diff --git a/OpenSim/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Examples/SimpleApp/SimpleApp.csproj
index eddb29e..810ecd4 100644
--- a/OpenSim/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Examples/SimpleApp/SimpleApp.csproj
@@ -50,7 +50,7 @@
50 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
53 <OutputPath>bin\</OutputPath> 53 <OutputPath>..\..\..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop> 54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -62,6 +62,10 @@
62 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> 62 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
63 <Private>False</Private> 63 <Private>False</Private>
64 </Reference> 64 </Reference>
65 <Reference Include="OpenSim.World" >
66 <HintPath>OpenSim.World.dll</HintPath>
67 <Private>False</Private>
68 </Reference>
65 <Reference Include="System" > 69 <Reference Include="System" >
66 <HintPath>System.dll</HintPath> 70 <HintPath>System.dll</HintPath>
67 <Private>False</Private> 71 <Private>False</Private>
diff --git a/OpenSim/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Examples/SimpleApp/SimpleApp.exe.build
index 922c557..b024219 100644
--- a/OpenSim/Examples/SimpleApp/SimpleApp.exe.build
+++ b/OpenSim/Examples/SimpleApp/SimpleApp.exe.build
@@ -27,6 +27,7 @@
27 <include name="../../../bin/OpenSim.GridInterfaces.Local.dll" /> 27 <include name="../../../bin/OpenSim.GridInterfaces.Local.dll" />
28 <include name="../../../bin/OpenSim.RegionServer.dll" /> 28 <include name="../../../bin/OpenSim.RegionServer.dll" />
29 <include name="../../../bin/OpenSim.Servers.dll" /> 29 <include name="../../../bin/OpenSim.Servers.dll" />
30 <include name="OpenSim.World.dll" />
30 <include name="System.dll" /> 31 <include name="System.dll" />
31 <include name="System.Data.dll.dll" /> 32 <include name="System.Data.dll.dll" />
32 <include name="System.Xml.dll" /> 33 <include name="System.Xml.dll" />