aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Examples/SimpleApp2
diff options
context:
space:
mode:
authorlbsa712007-06-17 16:49:33 +0000
committerlbsa712007-06-17 16:49:33 +0000
commit5d59ffe99d7c592d87361e3bb1b1ac152bf5980c (patch)
treec25b0b3e24b13597b3675ce09b3206cf07feef85 /OpenSim/Examples/SimpleApp2
parentVery Preliminary local teleporting added (currently only can teleport within... (diff)
downloadopensim-SC-5d59ffe99d7c592d87361e3bb1b1ac152bf5980c.zip
opensim-SC-5d59ffe99d7c592d87361e3bb1b1ac152bf5980c.tar.gz
opensim-SC-5d59ffe99d7c592d87361e3bb1b1ac152bf5980c.tar.bz2
opensim-SC-5d59ffe99d7c592d87361e3bb1b1ac152bf5980c.tar.xz
* 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
Diffstat (limited to '')
-rw-r--r--OpenSim/Examples/SimpleApp2/MyClientView.cs3
-rw-r--r--OpenSim/Examples/SimpleApp2/MyPacketServer.cs6
-rw-r--r--OpenSim/Examples/SimpleApp2/Program.cs12
-rw-r--r--OpenSim/Examples/SimpleApp2/SimpleApp2.csproj172
-rw-r--r--OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build53
5 files changed, 182 insertions, 64 deletions
diff --git a/OpenSim/Examples/SimpleApp2/MyClientView.cs b/OpenSim/Examples/SimpleApp2/MyClientView.cs
index dd8869c..4ef3c94 100644
--- a/OpenSim/Examples/SimpleApp2/MyClientView.cs
+++ b/OpenSim/Examples/SimpleApp2/MyClientView.cs
@@ -9,6 +9,7 @@ using libsecondlife.Packets;
9using OpenSim.Assets; 9using OpenSim.Assets;
10using OpenSim.Framework.Types; 10using OpenSim.Framework.Types;
11using OpenSim.Framework; 11using OpenSim.Framework;
12using OpenSim.Caches;
12 13
13namespace SimpleApp2 14namespace SimpleApp2
14{ 15{
@@ -40,7 +41,7 @@ namespace SimpleApp2
40 { 41 {
41 LLVector3 pos = new LLVector3(128, 128, 128); 42 LLVector3 pos = new LLVector3(128, 128, 128);
42 43
43 MoveAgentIntoRegion(m_world.RegionInfo); 44 MoveAgentIntoRegion(m_world.RegionInfo, pos, LLVector3.Zero );
44 45
45 SendAvatarData( m_world.RegionInfo, FirstName, 46 SendAvatarData( m_world.RegionInfo, FirstName,
46 LastName, AgentId, 0, 47 LastName, AgentId, 0,
diff --git a/OpenSim/Examples/SimpleApp2/MyPacketServer.cs b/OpenSim/Examples/SimpleApp2/MyPacketServer.cs
index 9c21016..67878c4 100644
--- a/OpenSim/Examples/SimpleApp2/MyPacketServer.cs
+++ b/OpenSim/Examples/SimpleApp2/MyPacketServer.cs
@@ -7,14 +7,16 @@ using System.Net;
7using libsecondlife.Packets; 7using libsecondlife.Packets;
8using OpenSim.Framework.Interfaces; 8using OpenSim.Framework.Interfaces;
9using OpenSim.Framework; 9using OpenSim.Framework;
10using OpenSim.Caches;
10 11
11namespace SimpleApp2 12namespace SimpleApp2
12{ 13{
13 public class MyPacketServer : PacketServer 14 public class MyPacketServer : PacketServer
14 { 15 {
15 private float[] m_map; 16 private float[] m_map;
16 17
17 public MyPacketServer(float[] map, OpenSimNetworkHandler networkHandler, uint port ) : base( networkHandler, port ) 18 public MyPacketServer(float[] map, ClientStackNetworkHandler networkHandler, uint port)
19 : base(networkHandler, port)
18 { 20 {
19 m_map = map; 21 m_map = map;
20 } 22 }
diff --git a/OpenSim/Examples/SimpleApp2/Program.cs b/OpenSim/Examples/SimpleApp2/Program.cs
index 9b977f6..34ede1b 100644
--- a/OpenSim/Examples/SimpleApp2/Program.cs
+++ b/OpenSim/Examples/SimpleApp2/Program.cs
@@ -9,9 +9,10 @@ using OpenSim.Framework.Types;
9using OpenSim.UserServer; 9using OpenSim.UserServer;
10using OpenSim.Framework.Console; 10using OpenSim.Framework.Console;
11using OpenSim.world; 11using OpenSim.world;
12using OpenSim.Physics.Manager;
13using OpenSim.Assets; 12using OpenSim.Assets;
14using libsecondlife; 13using libsecondlife;
14using OpenSim.Framework;
15using OpenSim.Caches;
15 16
16namespace SimpleApp2 17namespace SimpleApp2
17{ 18{
@@ -37,8 +38,8 @@ namespace SimpleApp2
37 LoginServer loginServer = new LoginServer(simAddr, simPort, 0, 0, false); 38 LoginServer loginServer = new LoginServer(simAddr, simPort, 0, 0, false);
38 loginServer.Startup(); 39 loginServer.Startup();
39 40
40 AuthenticateSessionsLocal localSessions = new AuthenticateSessionsLocal(); 41 AuthenticateSessionsBase localSessions = new AuthenticateSessionsBase();
41 loginServer.SetSessionHandler(localSessions.AddNewSessionHandler); 42 loginServer.SetSessionHandler( AddNewSessionHandler );
42 43
43 InventoryCache inventoryCache = new InventoryCache(); 44 InventoryCache inventoryCache = new InventoryCache();
44 45
@@ -86,9 +87,10 @@ namespace SimpleApp2
86 return map; 87 return map;
87 } 88 }
88 89
89 private void AddNewSessionHandler(Login loginData) 90 private bool AddNewSessionHandler(ulong regionHandle, Login loginData)
90 { 91 {
91 m_console.WriteLine(LogPriority.NORMAL, "Recieved Login from [{0}] [{1}]", loginData.First, loginData.Last); 92 m_console.WriteLine(LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last);
93 return true;
92 } 94 }
93 95
94 static void Main(string[] args) 96 static void Main(string[] args)
diff --git a/OpenSim/Examples/SimpleApp2/SimpleApp2.csproj b/OpenSim/Examples/SimpleApp2/SimpleApp2.csproj
index 92664e3..104c4cb 100644
--- a/OpenSim/Examples/SimpleApp2/SimpleApp2.csproj
+++ b/OpenSim/Examples/SimpleApp2/SimpleApp2.csproj
@@ -1,87 +1,147 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 3 <ProjectType>Local</ProjectType>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
6 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
7 <ProjectGuid>{C84B2171-D386-4377-B490-9C5A56674B9E}</ProjectGuid> 6 <ProjectGuid>{24DF2448-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon>
10 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName>
12 <AssemblyName>SimpleApp2</AssemblyName>
13 <DefaultClientScript>JScript</DefaultClientScript>
14 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign>
8 <OutputType>Exe</OutputType> 17 <OutputType>Exe</OutputType>
9 <AppDesignerFolder>Properties</AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
10 <RootNamespace>SimpleApp2</RootNamespace> 19 <RootNamespace>SimpleApp2</RootNamespace>
11 <AssemblyName>SimpleApp2</AssemblyName> 20 <StartupObject></StartupObject>
21 <FileUpgradeFlags>
22 </FileUpgradeFlags>
12 </PropertyGroup> 23 </PropertyGroup>
13 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> 24 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
14 <DebugSymbols>true</DebugSymbols> 25 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
15 <DebugType>full</DebugType> 26 <BaseAddress>285212672</BaseAddress>
16 <Optimize>false</Optimize> 27 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
17 <OutputPath>bin\Debug\</OutputPath> 28 <ConfigurationOverrideFile>
18 <DefineConstants>DEBUG;TRACE</DefineConstants> 29 </ConfigurationOverrideFile>
19 <ErrorReport>prompt</ErrorReport> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile>
32 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize>
35 <OutputPath>..\..\..\bin\</OutputPath>
36 <RegisterForComInterop>False</RegisterForComInterop>
37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
20 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn>
21 </PropertyGroup> 41 </PropertyGroup>
22 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
23 <DebugType>pdbonly</DebugType> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
24 <Optimize>true</Optimize> 44 <BaseAddress>285212672</BaseAddress>
25 <OutputPath>bin\Release\</OutputPath> 45 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
46 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile>
26 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
27 <ErrorReport>prompt</ErrorReport> 49 <DocumentationFile></DocumentationFile>
50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize>
53 <OutputPath>bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
28 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn>
29 </PropertyGroup> 59 </PropertyGroup>
30 <ItemGroup> 60 <ItemGroup>
31 <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL"> 61 <Reference Include="libsecondlife.dll" >
32 <SpecificVersion>False</SpecificVersion>
33 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> 62 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
63 <Private>False</Private>
64 </Reference>
65 <Reference Include="OpenSim.World" >
66 <HintPath>OpenSim.World.dll</HintPath>
67 <Private>False</Private>
68 </Reference>
69 <Reference Include="System" >
70 <HintPath>System.dll</HintPath>
71 <Private>False</Private>
72 </Reference>
73 <Reference Include="System.Data.dll" >
74 <HintPath>..\..\..\bin\System.Data.dll</HintPath>
75 <Private>False</Private>
76 </Reference>
77 <Reference Include="System.Xml" >
78 <HintPath>System.Xml.dll</HintPath>
79 <Private>False</Private>
34 </Reference> 80 </Reference>
35 <Reference Include="System" />
36 <Reference Include="System.Data" />
37 <Reference Include="System.Xml" />
38 </ItemGroup>
39 <ItemGroup>
40 <Compile Include="MyClientView.cs" />
41 <Compile Include="MyPacketServer.cs" />
42 <Compile Include="Program.cs" />
43 <Compile Include="Properties\AssemblyInfo.cs" />
44 </ItemGroup> 81 </ItemGroup>
45 <ItemGroup> 82 <ItemGroup>
46 <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 83 <ProjectReference Include="..\..\OpenSim.Caches\OpenSim.Caches.csproj">
47 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 84 <Name>OpenSim.Caches</Name>
48 <Name>OpenSim.Framework.Console</Name> 85 <Project>{1938EB12-0000-0000-0000-000000000000}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private>
49 </ProjectReference> 88 </ProjectReference>
50 <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> 89 <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
51 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
52 <Name>OpenSim.Framework</Name> 90 <Name>OpenSim.Framework</Name>
91 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
93 <Private>False</Private>
53 </ProjectReference> 94 </ProjectReference>
54 <ProjectReference Include="..\..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> 95 <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
55 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> 96 <Name>OpenSim.Framework.Console</Name>
56 <Name>OpenSim.Servers</Name> 97 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
57 </ProjectReference> 98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
58 <ProjectReference Include="..\..\..\Common\XmlRpcCS\XMLRPC.csproj"> 99 <Private>False</Private>
59 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
60 <Name>XMLRPC</Name>
61 </ProjectReference> 100 </ProjectReference>
62 <ProjectReference Include="..\..\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj"> 101 <ProjectReference Include="..\..\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj">
63 <Project>{546099CD-0000-0000-0000-000000000000}</Project>
64 <Name>OpenSim.GridInterfaces.Local</Name> 102 <Name>OpenSim.GridInterfaces.Local</Name>
65 </ProjectReference> 103 <Project>{546099CD-0000-0000-0000-000000000000}</Project>
66 <ProjectReference Include="..\..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> 104 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
67 <Project>{8BE16150-0000-0000-0000-000000000000}</Project> 105 <Private>False</Private>
68 <Name>OpenSim.Physics.Manager</Name>
69 </ProjectReference> 106 </ProjectReference>
70 <ProjectReference Include="..\..\OpenSim.RegionServer\OpenSim.RegionServer.csproj"> 107 <ProjectReference Include="..\..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
71 <Project>{632E1BFD-0000-0000-0000-000000000000}</Project>
72 <Name>OpenSim.RegionServer</Name> 108 <Name>OpenSim.RegionServer</Name>
109 <Project>{632E1BFD-0000-0000-0000-000000000000}</Project>
110 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
111 <Private>False</Private>
73 </ProjectReference> 112 </ProjectReference>
74 <ProjectReference Include="..\..\OpenSim.World\OpenSim.World.csproj"> 113 <ProjectReference Include="..\..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">
75 <Project>{642A14A8-0000-0000-0000-000000000000}</Project> 114 <Name>OpenSim.Servers</Name>
76 <Name>OpenSim.World</Name> 115 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
116 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
117 <Private>False</Private>
118 </ProjectReference>
119 <ProjectReference Include="..\..\..\Common\XmlRpcCS\XMLRPC.csproj">
120 <Name>XMLRPC</Name>
121 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
122 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
123 <Private>False</Private>
77 </ProjectReference> 124 </ProjectReference>
78 </ItemGroup> 125 </ItemGroup>
79 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> 126 <ItemGroup>
80 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 127 <Compile Include="MyClientView.cs">
81 Other similar extension points exist, see Microsoft.Common.targets. 128 <SubType>Code</SubType>
82 <Target Name="BeforeBuild"> 129 </Compile>
83 </Target> 130 <Compile Include="MyPacketServer.cs">
84 <Target Name="AfterBuild"> 131 <SubType>Code</SubType>
85 </Target> 132 </Compile>
86 --> 133 <Compile Include="Program.cs">
87</Project> \ No newline at end of file 134 <SubType>Code</SubType>
135 </Compile>
136 <Compile Include="Properties\AssemblyInfo.cs">
137 <SubType>Code</SubType>
138 </Compile>
139 </ItemGroup>
140 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
141 <PropertyGroup>
142 <PreBuildEvent>
143 </PreBuildEvent>
144 <PostBuildEvent>
145 </PostBuildEvent>
146 </PropertyGroup>
147</Project>
diff --git a/OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build b/OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build
new file mode 100644
index 0000000..b47e7c3
--- /dev/null
+++ b/OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build
@@ -0,0 +1,53 @@
1<?xml version="1.0" ?>
2<project name="SimpleApp2" default="build">
3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}">
8 </fileset>
9 </copy>
10 <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
11 <resources prefix="SimpleApp2" dynamicprefix="true" >
12 </resources>
13 <sources failonempty="true">
14 <include name="MyClientView.cs" />
15 <include name="MyPacketServer.cs" />
16 <include name="Program.cs" />
17 <include name="Properties/AssemblyInfo.cs" />
18 </sources>
19 <references basedir="${project::get-base-directory()}">
20 <lib>
21 <include name="${project::get-base-directory()}" />
22 <include name="${project::get-base-directory()}/${build.dir}" />
23 </lib>
24 <include name="../../../bin/libsecondlife.dll" />
25 <include name="../../../bin/OpenSim.Caches.dll" />
26 <include name="../../../bin/OpenSim.Framework.dll" />
27 <include name="../../../bin/OpenSim.Framework.Console.dll" />
28 <include name="../../../bin/OpenSim.GridInterfaces.Local.dll" />
29 <include name="../../../bin/OpenSim.RegionServer.dll" />
30 <include name="../../../bin/OpenSim.Servers.dll" />
31 <include name="../../../bin/OpenSim.World.dll" />
32 <include name="System.dll" />
33 <include name="System.Data.dll.dll" />
34 <include name="System.Xml.dll" />
35 <include name="../../../bin/XMLRPC.dll" />
36 </references>
37 </csc>
38 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
39 <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
40 <copy todir="${project::get-base-directory()}/../../../bin/">
41 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
42 <include name="*.dll"/>
43 <include name="*.exe"/>
44 </fileset>
45 </copy>
46 </target>
47 <target name="clean">
48 <delete dir="${bin.dir}" failonerror="false" />
49 <delete dir="${obj.dir}" failonerror="false" />
50 </target>
51 <target name="doc" description="Creates documentation.">
52 </target>
53</project>
generated by cgit v1.1 at 2024-12-23 21:23:41 +0000