From 5d59ffe99d7c592d87361e3bb1b1ac152bf5980c Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Sun, 17 Jun 2007 16:49:33 +0000
Subject: * Added the two Sample Apps to the solution * Made them build * They
don't work though, gotta have a look see at that later. * ignored a shitload
of bins
---
OpenSim/Examples/SimpleApp/MyWorld.cs | 2 +-
OpenSim/Examples/SimpleApp/Program.cs | 18 +--
OpenSim/Examples/SimpleApp/SimpleApp.csproj | 168 +++++++++++++++++--------
OpenSim/Examples/SimpleApp/SimpleApp.exe.build | 52 ++++++++
4 files changed, 176 insertions(+), 64 deletions(-)
create mode 100644 OpenSim/Examples/SimpleApp/SimpleApp.exe.build
(limited to 'OpenSim/Examples/SimpleApp')
diff --git a/OpenSim/Examples/SimpleApp/MyWorld.cs b/OpenSim/Examples/SimpleApp/MyWorld.cs
index 27775f1..d3da1c7 100644
--- a/OpenSim/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Examples/SimpleApp/MyWorld.cs
@@ -51,7 +51,7 @@ namespace SimpleApp
client.OnCompleteMovementToRegion += delegate()
{
- client.MoveAgentIntoRegion(m_regionInfo);
+ client.MoveAgentIntoRegion(m_regionInfo, pos, LLVector3.Zero );
};
client.OnCompleteMovementToRegion += delegate()
diff --git a/OpenSim/Examples/SimpleApp/Program.cs b/OpenSim/Examples/SimpleApp/Program.cs
index e44bdba..b3b04ab 100644
--- a/OpenSim/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Examples/SimpleApp/Program.cs
@@ -2,16 +2,17 @@ using System;
using System.Collections.Generic;
using System.Text;
using OpenSim;
-using OpenSim.Servers;
using OpenSim.GridInterfaces.Local;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
-using OpenSim.UserServer;
using OpenSim.Framework.Console;
using OpenSim.world;
-using OpenSim.Physics.Manager;
using OpenSim.Assets;
using libsecondlife;
+using OpenSim.UserServer;
+using OpenSim.Servers;
+using OpenSim.Framework;
+using OpenSim.Caches;
namespace SimpleApp
{
@@ -32,9 +33,9 @@ namespace SimpleApp
LoginServer loginServer = new LoginServer( simAddr, simPort, 0, 0, false );
loginServer.Startup();
-
- AuthenticateSessionsLocal localSessions = new AuthenticateSessionsLocal();
- loginServer.SetSessionHandler(localSessions.AddNewSessionHandler );
+ loginServer.SetSessionHandler( AddNewSessionHandler );
+
+ AuthenticateSessionsBase localSessions = new AuthenticateSessionsBase();
InventoryCache inventoryCache = new InventoryCache();
@@ -67,9 +68,10 @@ namespace SimpleApp
m_console.ReadLine();
}
- private void AddNewSessionHandler(Login loginData)
+ private bool AddNewSessionHandler(ulong regionHandle, Login loginData)
{
- m_console.WriteLine( LogPriority.NORMAL, "Recieved Login from [{0}] [{1}]", loginData.First, loginData.Last );
+ m_console.WriteLine( LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last );
+ return true;
}
#region IAssetReceiver Members
diff --git a/OpenSim/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Examples/SimpleApp/SimpleApp.csproj
index 51e14de..f7cca86 100644
--- a/OpenSim/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Examples/SimpleApp/SimpleApp.csproj
@@ -1,86 +1,144 @@
-
+
- Debug
- AnyCPU
+ Local
8.0.50727
2.0
- {AD062D99-DD53-4D37-A4B8-2AF635377AEB}
+ {24B12448-0000-0000-0000-000000000000}
+ Debug
+ AnyCPU
+
+
+
+ SimpleApp
+ JScript
+ Grid
+ IE50
+ false
Exe
- Properties
+
SimpleApp
- SimpleApp
+
+
+
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
+ False
+ 285212672
+ False
+
+
+ TRACE;DEBUG
+
+ True
+ 4096
+ False
+ ..\..\..\bin\
+ False
+ False
+ False
4
+
- pdbonly
- true
- bin\Release\
+ False
+ 285212672
+ False
+
+
TRACE
- prompt
+
+ False
+ 4096
+ True
+ bin\
+ False
+ False
+ False
4
+
-
- False
+
..\..\..\bin\libsecondlife.dll
+ False
+
+
+ OpenSim.World.dll
+ False
+
+
+ System.dll
+ False
+
+
+ ..\..\..\bin\System.Data.dll
+ False
+
+
+ System.Xml.dll
+ False
-
-
-
-
-
-
-
-
-
- {A7CD0630-0000-0000-0000-000000000000}
- OpenSim.Framework.Console
+
+ OpenSim.Caches
+ {1938EB12-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
- {8ACA2445-0000-0000-0000-000000000000}
OpenSim.Framework
+ {8ACA2445-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
-
- {8BB20F0A-0000-0000-0000-000000000000}
- OpenSim.Servers
-
-
- {8E81D43C-0000-0000-0000-000000000000}
- XMLRPC
+
+ OpenSim.Framework.Console
+ {A7CD0630-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
- {546099CD-0000-0000-0000-000000000000}
OpenSim.GridInterfaces.Local
-
-
- {8BE16150-0000-0000-0000-000000000000}
- OpenSim.Physics.Manager
+ {546099CD-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
- {632E1BFD-0000-0000-0000-000000000000}
OpenSim.RegionServer
+ {632E1BFD-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
-
- {642A14A8-0000-0000-0000-000000000000}
- OpenSim.World
+
+ OpenSim.Servers
+ {8BB20F0A-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
+
+
+ XMLRPC
+ {8E81D43C-0000-0000-0000-000000000000}
+ {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ False
-
-
-
\ No newline at end of file
+
+
+ Code
+
+
+ Code
+
+
+ Code
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Examples/SimpleApp/SimpleApp.exe.build
new file mode 100644
index 0000000..d63fe41
--- /dev/null
+++ b/OpenSim/Examples/SimpleApp/SimpleApp.exe.build
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--
cgit v1.1