diff options
Diffstat (limited to 'OpenSim')
17 files changed, 366 insertions, 136 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 | |||
51 | 51 | ||
52 | client.OnCompleteMovementToRegion += delegate() | 52 | client.OnCompleteMovementToRegion += delegate() |
53 | { | 53 | { |
54 | client.MoveAgentIntoRegion(m_regionInfo); | 54 | client.MoveAgentIntoRegion(m_regionInfo, pos, LLVector3.Zero ); |
55 | }; | 55 | }; |
56 | 56 | ||
57 | client.OnCompleteMovementToRegion += delegate() | 57 | 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; | |||
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Text; | 3 | using System.Text; |
4 | using OpenSim; | 4 | using OpenSim; |
5 | using OpenSim.Servers; | ||
6 | using OpenSim.GridInterfaces.Local; | 5 | using OpenSim.GridInterfaces.Local; |
7 | using OpenSim.Framework.Interfaces; | 6 | using OpenSim.Framework.Interfaces; |
8 | using OpenSim.Framework.Types; | 7 | using OpenSim.Framework.Types; |
9 | using OpenSim.UserServer; | ||
10 | using OpenSim.Framework.Console; | 8 | using OpenSim.Framework.Console; |
11 | using OpenSim.world; | 9 | using OpenSim.world; |
12 | using OpenSim.Physics.Manager; | ||
13 | using OpenSim.Assets; | 10 | using OpenSim.Assets; |
14 | using libsecondlife; | 11 | using libsecondlife; |
12 | using OpenSim.UserServer; | ||
13 | using OpenSim.Servers; | ||
14 | using OpenSim.Framework; | ||
15 | using OpenSim.Caches; | ||
15 | 16 | ||
16 | namespace SimpleApp | 17 | namespace SimpleApp |
17 | { | 18 | { |
@@ -32,9 +33,9 @@ namespace SimpleApp | |||
32 | 33 | ||
33 | LoginServer loginServer = new LoginServer( simAddr, simPort, 0, 0, false ); | 34 | LoginServer loginServer = new LoginServer( simAddr, simPort, 0, 0, false ); |
34 | loginServer.Startup(); | 35 | loginServer.Startup(); |
35 | 36 | loginServer.SetSessionHandler( AddNewSessionHandler ); | |
36 | AuthenticateSessionsLocal localSessions = new AuthenticateSessionsLocal(); | 37 | |
37 | loginServer.SetSessionHandler(localSessions.AddNewSessionHandler ); | 38 | AuthenticateSessionsBase localSessions = new AuthenticateSessionsBase(); |
38 | 39 | ||
39 | InventoryCache inventoryCache = new InventoryCache(); | 40 | InventoryCache inventoryCache = new InventoryCache(); |
40 | 41 | ||
@@ -67,9 +68,10 @@ namespace SimpleApp | |||
67 | m_console.ReadLine(); | 68 | m_console.ReadLine(); |
68 | } | 69 | } |
69 | 70 | ||
70 | private void AddNewSessionHandler(Login loginData) | 71 | private bool AddNewSessionHandler(ulong regionHandle, Login loginData) |
71 | { | 72 | { |
72 | m_console.WriteLine( LogPriority.NORMAL, "Recieved Login from [{0}] [{1}]", loginData.First, loginData.Last ); | 73 | m_console.WriteLine( LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last ); |
74 | return true; | ||
73 | } | 75 | } |
74 | 76 | ||
75 | #region IAssetReceiver Members | 77 | #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 @@ | |||
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>{AD062D99-DD53-4D37-A4B8-2AF635377AEB}</ProjectGuid> | 6 | <ProjectGuid>{24B12448-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>SimpleApp</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>SimpleApp</RootNamespace> | 19 | <RootNamespace>SimpleApp</RootNamespace> |
11 | <AssemblyName>SimpleApp</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="MyWorld.cs" /> | ||
41 | <Compile Include="Program.cs" /> | ||
42 | <Compile Include="Properties\AssemblyInfo.cs" /> | ||
43 | </ItemGroup> | 81 | </ItemGroup> |
44 | <ItemGroup> | 82 | <ItemGroup> |
45 | <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 83 | <ProjectReference Include="..\..\OpenSim.Caches\OpenSim.Caches.csproj"> |
46 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 84 | <Name>OpenSim.Caches</Name> |
47 | <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> | ||
48 | </ProjectReference> | 88 | </ProjectReference> |
49 | <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> | 89 | <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> |
50 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | ||
51 | <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> | ||
52 | </ProjectReference> | 94 | </ProjectReference> |
53 | <ProjectReference Include="..\..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> | 95 | <ProjectReference Include="..\..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> |
54 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> | 96 | <Name>OpenSim.Framework.Console</Name> |
55 | <Name>OpenSim.Servers</Name> | 97 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> |
56 | </ProjectReference> | 98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
57 | <ProjectReference Include="..\..\..\Common\XmlRpcCS\XMLRPC.csproj"> | 99 | <Private>False</Private> |
58 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | ||
59 | <Name>XMLRPC</Name> | ||
60 | </ProjectReference> | 100 | </ProjectReference> |
61 | <ProjectReference Include="..\..\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj"> | 101 | <ProjectReference Include="..\..\OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj"> |
62 | <Project>{546099CD-0000-0000-0000-000000000000}</Project> | ||
63 | <Name>OpenSim.GridInterfaces.Local</Name> | 102 | <Name>OpenSim.GridInterfaces.Local</Name> |
64 | </ProjectReference> | 103 | <Project>{546099CD-0000-0000-0000-000000000000}</Project> |
65 | <ProjectReference Include="..\..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> | 104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
66 | <Project>{8BE16150-0000-0000-0000-000000000000}</Project> | 105 | <Private>False</Private> |
67 | <Name>OpenSim.Physics.Manager</Name> | ||
68 | </ProjectReference> | 106 | </ProjectReference> |
69 | <ProjectReference Include="..\..\OpenSim.RegionServer\OpenSim.RegionServer.csproj"> | 107 | <ProjectReference Include="..\..\OpenSim.RegionServer\OpenSim.RegionServer.csproj"> |
70 | <Project>{632E1BFD-0000-0000-0000-000000000000}</Project> | ||
71 | <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> | ||
72 | </ProjectReference> | 112 | </ProjectReference> |
73 | <ProjectReference Include="..\..\OpenSim.World\OpenSim.World.csproj"> | 113 | <ProjectReference Include="..\..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> |
74 | <Project>{642A14A8-0000-0000-0000-000000000000}</Project> | 114 | <Name>OpenSim.Servers</Name> |
75 | <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> | ||
76 | </ProjectReference> | 124 | </ProjectReference> |
77 | </ItemGroup> | 125 | </ItemGroup> |
78 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 126 | <ItemGroup> |
79 | <!-- To modify your build process, add your task inside one of the targets below and uncomment it. | 127 | <Compile Include="MyWorld.cs"> |
80 | Other similar extension points exist, see Microsoft.Common.targets. | 128 | <SubType>Code</SubType> |
81 | <Target Name="BeforeBuild"> | 129 | </Compile> |
82 | </Target> | 130 | <Compile Include="Program.cs"> |
83 | <Target Name="AfterBuild"> | 131 | <SubType>Code</SubType> |
84 | </Target> | 132 | </Compile> |
85 | --> | 133 | <Compile Include="Properties\AssemblyInfo.cs"> |
86 | </Project> \ No newline at end of file | 134 | <SubType>Code</SubType> |
135 | </Compile> | ||
136 | </ItemGroup> | ||
137 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | ||
138 | <PropertyGroup> | ||
139 | <PreBuildEvent> | ||
140 | </PreBuildEvent> | ||
141 | <PostBuildEvent> | ||
142 | </PostBuildEvent> | ||
143 | </PropertyGroup> | ||
144 | </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 @@ | |||
1 | <?xml version="1.0" ?> | ||
2 | <project name="SimpleApp" 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="SimpleApp" dynamicprefix="true" > | ||
12 | </resources> | ||
13 | <sources failonempty="true"> | ||
14 | <include name="MyWorld.cs" /> | ||
15 | <include name="Program.cs" /> | ||
16 | <include name="Properties/AssemblyInfo.cs" /> | ||
17 | </sources> | ||
18 | <references basedir="${project::get-base-directory()}"> | ||
19 | <lib> | ||
20 | <include name="${project::get-base-directory()}" /> | ||
21 | <include name="${project::get-base-directory()}/${build.dir}" /> | ||
22 | </lib> | ||
23 | <include name="../../../bin/libsecondlife.dll" /> | ||
24 | <include name="../../../bin/OpenSim.Caches.dll" /> | ||
25 | <include name="../../../bin/OpenSim.Framework.dll" /> | ||
26 | <include name="../../../bin/OpenSim.Framework.Console.dll" /> | ||
27 | <include name="../../../bin/OpenSim.GridInterfaces.Local.dll" /> | ||
28 | <include name="../../../bin/OpenSim.RegionServer.dll" /> | ||
29 | <include name="../../../bin/OpenSim.Servers.dll" /> | ||
30 | <include name="../../../bin/OpenSim.World.dll" /> | ||
31 | <include name="System.dll" /> | ||
32 | <include name="System.Data.dll.dll" /> | ||
33 | <include name="System.Xml.dll" /> | ||
34 | <include name="../../../bin/XMLRPC.dll" /> | ||
35 | </references> | ||
36 | </csc> | ||
37 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" /> | ||
38 | <mkdir dir="${project::get-base-directory()}/../../../bin/"/> | ||
39 | <copy todir="${project::get-base-directory()}/../../../bin/"> | ||
40 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | ||
41 | <include name="*.dll"/> | ||
42 | <include name="*.exe"/> | ||
43 | </fileset> | ||
44 | </copy> | ||
45 | </target> | ||
46 | <target name="clean"> | ||
47 | <delete dir="${bin.dir}" failonerror="false" /> | ||
48 | <delete dir="${obj.dir}" failonerror="false" /> | ||
49 | </target> | ||
50 | <target name="doc" description="Creates documentation."> | ||
51 | </target> | ||
52 | </project> | ||
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; | |||
9 | using OpenSim.Assets; | 9 | using OpenSim.Assets; |
10 | using OpenSim.Framework.Types; | 10 | using OpenSim.Framework.Types; |
11 | using OpenSim.Framework; | 11 | using OpenSim.Framework; |
12 | using OpenSim.Caches; | ||
12 | 13 | ||
13 | namespace SimpleApp2 | 14 | namespace 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; | |||
7 | using libsecondlife.Packets; | 7 | using libsecondlife.Packets; |
8 | using OpenSim.Framework.Interfaces; | 8 | using OpenSim.Framework.Interfaces; |
9 | using OpenSim.Framework; | 9 | using OpenSim.Framework; |
10 | using OpenSim.Caches; | ||
10 | 11 | ||
11 | namespace SimpleApp2 | 12 | namespace 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; | |||
9 | using OpenSim.UserServer; | 9 | using OpenSim.UserServer; |
10 | using OpenSim.Framework.Console; | 10 | using OpenSim.Framework.Console; |
11 | using OpenSim.world; | 11 | using OpenSim.world; |
12 | using OpenSim.Physics.Manager; | ||
13 | using OpenSim.Assets; | 12 | using OpenSim.Assets; |
14 | using libsecondlife; | 13 | using libsecondlife; |
14 | using OpenSim.Framework; | ||
15 | using OpenSim.Caches; | ||
15 | 16 | ||
16 | namespace SimpleApp2 | 17 | namespace 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> | ||
diff --git a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj.user b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj.user index 5941547..518ce40 100644 --- a/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj.user +++ b/OpenSim/OpenSim.LocalCommunications/OpenSim.LocalCommunications.csproj.user | |||
@@ -2,7 +2,7 @@ | |||
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
5 | <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\Sugilite\bin\</ReferencePath> | 5 | <ReferencePath>C:\Documents and Settings\Stefan\My Documents\source\opensim\branches\Sugilite\bin\</ReferencePath> |
6 | <LastOpenVersion>8.0.50727</LastOpenVersion> | 6 | <LastOpenVersion>8.0.50727</LastOpenVersion> |
7 | <ProjectView>ProjectFiles</ProjectView> | 7 | <ProjectView>ProjectFiles</ProjectView> |
8 | <ProjectTrust>0</ProjectTrust> | 8 | <ProjectTrust>0</ProjectTrust> |
diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj index f88eb32..5f8b0ed 100644 --- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj +++ b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj | |||
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\..\..\bin\Physics\</OutputPath> | 53 | <OutputPath>bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj index 08f54aa..22d7786 100644 --- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj +++ b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj | |||
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\..\..\bin\Physics\</OutputPath> | 53 | <OutputPath>bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj index aa89cc1..0cebe66 100644 --- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj +++ b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj | |||
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\..\..\bin\Physics\</OutputPath> | 53 | <OutputPath>bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj index 94efbed..2a5d6ec 100644 --- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj +++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj | |||
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\..\bin\</OutputPath> | 53 | <OutputPath>bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 63eeb9c..17a651d 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj | |||
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\..\bin\</OutputPath> | 53 | <OutputPath>bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj index aae0ab8..e38c879 100644 --- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj +++ b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj | |||
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\..\bin\</OutputPath> | 53 | <OutputPath>bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
diff --git a/OpenSim/OpenSim/OpenSim.csproj b/OpenSim/OpenSim/OpenSim.csproj index fb0e0c1..df3a32c 100644 --- a/OpenSim/OpenSim/OpenSim.csproj +++ b/OpenSim/OpenSim/OpenSim.csproj | |||
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\..\bin\</OutputPath> | 53 | <OutputPath>bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |