* re-added SimpleApp projects

* made them work (yay!)
* some cleanup

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
         private ConsoleBase m_console;

         private RegionInfo m_regionInfo;

         private float[] m_map;

+        private AuthenticateSessionsBase m_circuitManager;

         

         private void Run()

         {

@@ -34,10 +35,11 @@ namespace SimpleApp2
             string simAddr = "127.0.0.1";

             int simPort = 9000;

 

+            m_circuitManager = new AuthenticateSessionsBase();            

+            

             LoginServer loginServer = new LoginServer(simAddr, simPort, 0, 0, false);

             loginServer.Startup();

 

-            AuthenticateSessionsBase localSessions = new AuthenticateSessionsBase();

             loginServer.SetSessionHandler( AddNewSessionHandler );

 

             InventoryCache inventoryCache = new InventoryCache();

@@ -48,7 +50,7 @@ namespace SimpleApp2
 

             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 MyPacketServer(m_map, udpServer, (uint) simPort );

             udpServer.ServerListener();

 

@@ -89,6 +91,20 @@ namespace SimpleApp2
         private bool AddNewSessionHandler(ulong regionHandle, Login loginData)

         {

             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;

         }

 

@@ -99,6 +115,7 @@ namespace SimpleApp2
             app.Run();

         }

 

+

         #region IWorld Members

 

         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 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{24DF2448-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>SimpleApp2</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Exe</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>SimpleApp2</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,31 +51,37 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

-    <OutputPath>bin\</OutputPath>

+    <OutputPath>..\..\..\bin\</OutputPath>

     <RegisterForComInterop>False</RegisterForComInterop>

     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="libsecondlife.dll" >

+    <Reference Include="libsecondlife.dll">

       <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System" >

+    <Reference Include="OpenSim.World">

+      <HintPath>OpenSim.World.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Data.dll" >

+    <Reference Include="System.Data.dll">

       <HintPath>..\..\..\bin\System.Data.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Xml">

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -80,43 +91,43 @@
       <Name>OpenSim.Caches</Name>

       <Project>{1938EB12-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">

       <Name>OpenSim.Framework</Name>

       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">

       <Name>OpenSim.Framework.Console</Name>

       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj">

       <Name>OpenSim.GridInterfaces.Local</Name>

       <Project>{546099CD-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">

       <Name>OpenSim.RegionServer</Name>

       <Project>{632E1BFD-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">

       <Name>OpenSim.Servers</Name>

       <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\..\Common\XmlRpcCS\XMLRPC.csproj">

       <Name>XMLRPC</Name>

       <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>

       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

@@ -140,4 +151,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</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 @@
                 <include name="../../../bin/OpenSim.GridInterfaces.Local.dll" />

                 <include name="../../../bin/OpenSim.RegionServer.dll" />

                 <include name="../../../bin/OpenSim.Servers.dll" />

+                <include name="OpenSim.World.dll" />

                 <include name="System.dll" />

                 <include name="System.Data.dll.dll" />

                 <include name="System.Xml.dll" />