* 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

4 files changed, 176 insertions, 64 deletions

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

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

   <PropertyGroup>

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

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

+    <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{AD062D99-DD53-4D37-A4B8-2AF635377AEB}</ProjectGuid>

+    <ProjectGuid>{24B12448-0000-0000-0000-000000000000}</ProjectGuid>

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

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

+    <ApplicationIcon></ApplicationIcon>

+    <AssemblyKeyContainerName>

+    </AssemblyKeyContainerName>

+    <AssemblyName>SimpleApp</AssemblyName>

+    <DefaultClientScript>JScript</DefaultClientScript>

+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>

+    <DefaultTargetSchema>IE50</DefaultTargetSchema>

+    <DelaySign>false</DelaySign>

     <OutputType>Exe</OutputType>

-    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <AppDesignerFolder></AppDesignerFolder>

     <RootNamespace>SimpleApp</RootNamespace>

-    <AssemblyName>SimpleApp</AssemblyName>

+    <StartupObject></StartupObject>

+    <FileUpgradeFlags>

+    </FileUpgradeFlags>

   </PropertyGroup>

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

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>bin\Debug\</OutputPath>

-    <DefineConstants>DEBUG;TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

+    <BaseAddress>285212672</BaseAddress>

+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>

+    <ConfigurationOverrideFile>

+    </ConfigurationOverrideFile>

+    <DefineConstants>TRACE;DEBUG</DefineConstants>

+    <DocumentationFile></DocumentationFile>

+    <DebugSymbols>True</DebugSymbols>

+    <FileAlignment>4096</FileAlignment>

+    <Optimize>False</Optimize>

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

+    <RegisterForComInterop>False</RegisterForComInterop>

+    <RemoveIntegerChecks>False</RemoveIntegerChecks>

+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

+    <NoWarn></NoWarn>

   </PropertyGroup>

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

-    <DebugType>pdbonly</DebugType>

-    <Optimize>true</Optimize>

-    <OutputPath>bin\Release\</OutputPath>

+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

+    <BaseAddress>285212672</BaseAddress>

+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>

+    <ConfigurationOverrideFile>

+    </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

+    <DocumentationFile></DocumentationFile>

+    <DebugSymbols>False</DebugSymbols>

+    <FileAlignment>4096</FileAlignment>

+    <Optimize>True</Optimize>

+    <OutputPath>bin\</OutputPath>

+    <RegisterForComInterop>False</RegisterForComInterop>

+    <RemoveIntegerChecks>False</RemoveIntegerChecks>

+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

+    <NoWarn></NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">

-      <SpecificVersion>False</SpecificVersion>

+    <Reference Include="libsecondlife.dll" >

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

+      <Private>False</Private>

+    </Reference>

+    <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" >

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

+      <Private>False</Private>

+    </Reference>

+    <Reference Include="System.Xml" >

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

+      <Private>False</Private>

     </Reference>

-    <Reference Include="System" />

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

-    <Reference Include="System.Xml" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="MyWorld.cs" />

-    <Compile Include="Program.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

   </ItemGroup>

   <ItemGroup>

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

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

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

+    <ProjectReference Include="..\..\OpenSim.Caches\OpenSim.Caches.csproj">

+      <Name>OpenSim.Caches</Name>

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

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

+                        <Private>False</Private>

     </ProjectReference>

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

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

       <Name>OpenSim.Framework</Name>

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

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

+                        <Private>False</Private>

     </ProjectReference>

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

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

-      <Name>OpenSim.Servers</Name>

-    </ProjectReference>

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

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

-      <Name>XMLRPC</Name>

+    <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>

     </ProjectReference>

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

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

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

-    </ProjectReference>

-    <ProjectReference Include="..\..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">

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

-      <Name>OpenSim.Physics.Manager</Name>

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

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

+                        <Private>False</Private>

     </ProjectReference>

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

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

       <Name>OpenSim.RegionServer</Name>

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

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

+                        <Private>False</Private>

     </ProjectReference>

-    <ProjectReference Include="..\..\OpenSim.World\OpenSim.World.csproj">

-      <Project>{642A14A8-0000-0000-0000-000000000000}</Project>

-      <Name>OpenSim.World</Name>

+    <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>

+    </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>

     </ProjectReference>

   </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

-</Project>
\ No newline at end of file
+  <ItemGroup>

+    <Compile Include="MyWorld.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Program.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Properties\AssemblyInfo.cs">

+      <SubType>Code</SubType>

+    </Compile>

+  </ItemGroup>

+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

+  <PropertyGroup>

+    <PreBuildEvent>

+    </PreBuildEvent>

+    <PostBuildEvent>

+    </PostBuildEvent>

+  </PropertyGroup>

+</Project>

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 @@
+<?xml version="1.0" ?>

+<project name="SimpleApp" default="build">

+    <target name="build">

+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />

+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />

+        <copy todir="${project::get-base-directory()}/${build.dir}">

+            <fileset basedir="${project::get-base-directory()}">

+            </fileset>

+        </copy>

+        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">

+            <resources prefix="SimpleApp" dynamicprefix="true" >

+            </resources>

+            <sources failonempty="true">

+                <include name="MyWorld.cs" />

+                <include name="Program.cs" />

+                <include name="Properties/AssemblyInfo.cs" />

+            </sources>

+            <references basedir="${project::get-base-directory()}">

+                <lib>

+                    <include name="${project::get-base-directory()}" />

+                    <include name="${project::get-base-directory()}/${build.dir}" />

+                </lib>

+                <include name="../../../bin/libsecondlife.dll" />

+                <include name="../../../bin/OpenSim.Caches.dll" />

+                <include name="../../../bin/OpenSim.Framework.dll" />

+                <include name="../../../bin/OpenSim.Framework.Console.dll" />

+                <include name="../../../bin/OpenSim.GridInterfaces.Local.dll" />

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

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

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

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

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

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

+                <include name="../../../bin/XMLRPC.dll" />

+            </references>

+        </csc>

+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />

+        <mkdir dir="${project::get-base-directory()}/../../../bin/"/>

+        <copy todir="${project::get-base-directory()}/../../../bin/">

+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >

+                <include name="*.dll"/>

+                <include name="*.exe"/>

+            </fileset>

+        </copy>

+    </target>

+    <target name="clean">

+        <delete dir="${bin.dir}" failonerror="false" />

+        <delete dir="${obj.dir}" failonerror="false" />

+    </target>

+    <target name="doc" description="Creates documentation.">

+    </target>

+</project>