From 8edcc844c443a8d2567d2ca1e468fa3324272b98 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Wed, 20 Jun 2007 11:41:45 +0000
Subject: * re-added SimpleApp projects * made them work (yay!) * some cleanup
---
OpenSim/Examples/SimpleApp/Program.cs | 21 ++++++++++++++++++---
OpenSim/Examples/SimpleApp/SimpleApp.csproj | 6 +++++-
OpenSim/Examples/SimpleApp/SimpleApp.exe.build | 1 +
3 files changed, 24 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Examples/SimpleApp')
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
class Program : IAssetReceiver, conscmd_callback
{
private ConsoleBase m_console;
+ AuthenticateSessionsBase m_circuitManager;
private void Run()
{
@@ -34,7 +35,7 @@ namespace SimpleApp
loginServer.Startup();
loginServer.SetSessionHandler( AddNewSessionHandler );
- AuthenticateSessionsBase localSessions = new AuthenticateSessionsBase();
+ m_circuitManager = new AuthenticateSessionsBase();
InventoryCache inventoryCache = new InventoryCache();
@@ -44,7 +45,7 @@ namespace SimpleApp
AssetCache assetCache = new AssetCache(assetServer);
- UDPServer udpServer = new UDPServer(simPort, assetCache, inventoryCache, m_console, localSessions );
+ UDPServer udpServer = new UDPServer(simPort, assetCache, inventoryCache, m_console, m_circuitManager );
PacketServer packetServer = new PacketServer( udpServer, (uint) simPort );
udpServer.ServerListener();
@@ -69,7 +70,21 @@ namespace SimpleApp
private bool AddNewSessionHandler(ulong regionHandle, Login loginData)
{
- m_console.WriteLine( LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last );
+ m_console.WriteLine(LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last);
+
+ AgentCircuitData agent = new AgentCircuitData();
+ agent.AgentID = loginData.Agent;
+ agent.firstname = loginData.First;
+ agent.lastname = loginData.Last;
+ agent.SessionID = loginData.Session;
+ agent.SecureSessionID = loginData.SecureSession;
+ agent.circuitcode = loginData.CircuitCode;
+ agent.BaseFolder = loginData.BaseFolder;
+ agent.InventoryFolder = loginData.InventoryFolder;
+ agent.startpos = new LLVector3(128, 128, 70);
+
+ m_circuitManager.AddNewCircuit(agent.circuitcode, agent);
+
return true;
}
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 @@
False
4096
True
- bin\
+ ..\..\..\bin\
False
False
False
@@ -62,6 +62,10 @@
..\..\..\bin\libsecondlife.dll
False
+
+ OpenSim.World.dll
+ False
+
System.dll
False
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 @@
+
--
cgit v1.1