diff options
25 files changed, 542 insertions, 329 deletions
diff --git a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj index df68722..ad5480b 100644 --- a/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.csproj +++ b/Common/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.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/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj index a89a38d..ba50752 100644 --- a/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.csproj +++ b/OpenGridServices/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.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.build b/OpenSim.build index 711c7c4..9eb05c7 100644 --- a/OpenSim.build +++ b/OpenSim.build | |||
@@ -66,6 +66,8 @@ | |||
66 | <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> | 66 | <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> |
67 | <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" /> | 67 | <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" /> |
68 | <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" /> | 68 | <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" /> |
69 | <nant buildfile="OpenSim/Examples/SimpleApp/SimpleApp.exe.build" target="clean" /> | ||
70 | <nant buildfile="OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build" target="clean" /> | ||
69 | <nant buildfile="Common/XmlRpcCS/XMLRPC.dll.build" target="clean" /> | 71 | <nant buildfile="Common/XmlRpcCS/XMLRPC.dll.build" target="clean" /> |
70 | </target> | 72 | </target> |
71 | 73 | ||
@@ -91,6 +93,8 @@ | |||
91 | <nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" /> | 93 | <nant buildfile="OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" /> |
92 | <nant buildfile="OpenSim/OpenSim.Region/OpenSim.Region.dll.build" target="build" /> | 94 | <nant buildfile="OpenSim/OpenSim.Region/OpenSim.Region.dll.build" target="build" /> |
93 | <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="build" /> | 95 | <nant buildfile="OpenSim/OpenSim/OpenSim.exe.build" target="build" /> |
96 | <nant buildfile="OpenSim/Examples/SimpleApp/SimpleApp.exe.build" target="build" /> | ||
97 | <nant buildfile="OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build" target="build" /> | ||
94 | </target> | 98 | </target> |
95 | 99 | ||
96 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> | 100 | <target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> |
@@ -121,6 +125,8 @@ | |||
121 | <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> | 125 | <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> |
122 | <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" /> | 126 | <nant buildfile="OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" /> |
123 | <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" /> | 127 | <nant buildfile="OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" /> |
128 | <nant buildfile="OpenSim/Examples/SimpleApp/SimpleApp.exe.build" target="doc" /> | ||
129 | <nant buildfile="OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build" target="doc" /> | ||
124 | <nant buildfile="Common/XmlRpcCS/XMLRPC.dll.build" target="doc" /> | 130 | <nant buildfile="Common/XmlRpcCS/XMLRPC.dll.build" target="doc" /> |
125 | </target> | 131 | </target> |
126 | 132 | ||
diff --git a/OpenSim.sln b/OpenSim.sln index 2c1b58f..e854bb6 100644 --- a/OpenSim.sln +++ b/OpenSim.sln | |||
@@ -1,5 +1,5 @@ | |||
1 | Microsoft Visual Studio Solution File, Format Version 9.00 | 1 | Microsoft Visual Studio Solution File, Format Version 9.00 |
2 | # Visual C# Express 2005 | 2 | # Visual Studio 2005 |
3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Communications", "Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj", "{683344D5-0000-0000-0000-000000000000}" | 3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Communications", "Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj", "{683344D5-0000-0000-0000-000000000000}" |
4 | EndProject | 4 | EndProject |
5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}" | 5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}" |
@@ -40,6 +40,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorag | |||
40 | EndProject | 40 | EndProject |
41 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" | 41 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" |
42 | EndProject | 42 | EndProject |
43 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-0000-0000-0000-000000000000}" | ||
44 | EndProject | ||
45 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp2", "OpenSim\Examples\SimpleApp2\SimpleApp2.csproj", "{24DF2448-0000-0000-0000-000000000000}" | ||
46 | EndProject | ||
43 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" | 47 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" |
44 | EndProject | 48 | EndProject |
45 | Global | 49 | Global |
@@ -128,6 +132,14 @@ Global | |||
128 | {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 132 | {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
129 | {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 133 | {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
130 | {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 134 | {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
135 | {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
136 | {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
137 | {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
138 | {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
139 | {24DF2448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
140 | {24DF2448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
141 | {24DF2448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
142 | {24DF2448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
131 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 143 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
132 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 144 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
133 | {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 145 | {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
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> |
diff --git a/Prebuild/Prebuild.build b/Prebuild/Prebuild.build index 395fb31..c6c4660 100644 --- a/Prebuild/Prebuild.build +++ b/Prebuild/Prebuild.build | |||
@@ -12,13 +12,6 @@ | |||
12 | <property name="build.debug" value="true" /> | 12 | <property name="build.debug" value="true" /> |
13 | </target> | 13 | </target> |
14 | 14 | ||
15 | <property name="project.config" value="Release" /> | ||
16 | |||
17 | <target name="Release" description=""> | ||
18 | <property name="project.config" value="Release" /> | ||
19 | <property name="build.debug" value="false" /> | ||
20 | </target> | ||
21 | |||
22 | <target name="net-1.1" description="Sets framework to .NET 1.1"> | 15 | <target name="net-1.1" description="Sets framework to .NET 1.1"> |
23 | <property name="nant.settings.currentframework" value="net-1.1" /> | 16 | <property name="nant.settings.currentframework" value="net-1.1" /> |
24 | </target> | 17 | </target> |
diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln index 449896b..440c8ba 100644 --- a/Prebuild/Prebuild.sln +++ b/Prebuild/Prebuild.sln | |||
@@ -5,13 +5,10 @@ EndProject | |||
5 | Global | 5 | Global |
6 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 6 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
7 | Debug|Any CPU = Debug|Any CPU | 7 | Debug|Any CPU = Debug|Any CPU |
8 | Release|Any CPU = Release|Any CPU | ||
9 | EndGlobalSection | 8 | EndGlobalSection |
10 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | 9 | GlobalSection(ProjectConfigurationPlatforms) = postSolution |
11 | {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 10 | {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
12 | {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 11 | {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
13 | {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
14 | {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
15 | EndGlobalSection | 12 | EndGlobalSection |
16 | GlobalSection(SolutionProperties) = preSolution | 13 | GlobalSection(SolutionProperties) = preSolution |
17 | HideSolutionNode = FALSE | 14 | HideSolutionNode = FALSE |
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj index c8b859c..bda6129 100644 --- a/Prebuild/src/Prebuild.csproj +++ b/Prebuild/src/Prebuild.csproj | |||
@@ -41,24 +41,6 @@ | |||
41 | <WarningLevel>4</WarningLevel> | 41 | <WarningLevel>4</WarningLevel> |
42 | <NoWarn>1595</NoWarn> | 42 | <NoWarn>1595</NoWarn> |
43 | </PropertyGroup> | 43 | </PropertyGroup> |
44 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
45 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | ||
46 | <BaseAddress>285212672</BaseAddress> | ||
47 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> | ||
48 | <ConfigurationOverrideFile> | ||
49 | </ConfigurationOverrideFile> | ||
50 | <DefineConstants>TRACE</DefineConstants> | ||
51 | <DocumentationFile></DocumentationFile> | ||
52 | <DebugSymbols>False</DebugSymbols> | ||
53 | <FileAlignment>4096</FileAlignment> | ||
54 | <Optimize>True</Optimize> | ||
55 | <OutputPath>..\..\bin\</OutputPath> | ||
56 | <RegisterForComInterop>False</RegisterForComInterop> | ||
57 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | ||
58 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | ||
59 | <WarningLevel>4</WarningLevel> | ||
60 | <NoWarn>1595</NoWarn> | ||
61 | </PropertyGroup> | ||
62 | <ItemGroup> | 44 | <ItemGroup> |
63 | <Reference Include="System" > | 45 | <Reference Include="System" > |
64 | <HintPath>System.dll</HintPath> | 46 | <HintPath>System.dll</HintPath> |
diff --git a/prebuild.xml b/prebuild.xml index a66dab4..95600f8 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -33,7 +33,7 @@ | |||
33 | </Configuration> | 33 | </Configuration> |
34 | 34 | ||
35 | <!-- XML-RPC --> | 35 | <!-- XML-RPC --> |
36 | <Project name="XMLRPC" path="Common/XmlRpcCS" type="Library"> | 36 | <Project name="XMLRPC" path="Common/XmlRpcCS" type="Library"> |
37 | <Configuration name="Debug"> | 37 | <Configuration name="Debug"> |
38 | <Options> | 38 | <Options> |
39 | <OutputPath>../../bin/</OutputPath> | 39 | <OutputPath>../../bin/</OutputPath> |
@@ -93,7 +93,7 @@ | |||
93 | <Reference name="libsecondlife.dll"/> | 93 | <Reference name="libsecondlife.dll"/> |
94 | <Reference name="Db4objects.Db4o.dll"/> | 94 | <Reference name="Db4objects.Db4o.dll"/> |
95 | <Reference name="XMLRPC"/> | 95 | <Reference name="XMLRPC"/> |
96 | <Reference name="OpenSim.Framework.Console"/> | 96 | <Reference name="OpenSim.Framework.Console"/> |
97 | <Files> | 97 | <Files> |
98 | <Match pattern="*.cs" recurse="true"/> | 98 | <Match pattern="*.cs" recurse="true"/> |
99 | </Files> | 99 | </Files> |
@@ -114,18 +114,18 @@ | |||
114 | <ReferencePath>../../bin/</ReferencePath> | 114 | <ReferencePath>../../bin/</ReferencePath> |
115 | <Reference name="System"/> | 115 | <Reference name="System"/> |
116 | <Reference name="System.Xml"/> | 116 | <Reference name="System.Xml"/> |
117 | <Reference name="OpenSim.Framework"/> | 117 | <Reference name="OpenSim.Framework"/> |
118 | <Reference name="OpenSim.Framework.Console"/> | 118 | <Reference name="OpenSim.Framework.Console"/> |
119 | <Reference name="libsecondlife.dll"/> | 119 | <Reference name="libsecondlife.dll"/> |
120 | <Reference name="XMLRPC"/> | 120 | <Reference name="XMLRPC"/> |
121 | 121 | ||
122 | <Files> | 122 | <Files> |
123 | <Match pattern="*.cs" recurse="true"/> | 123 | <Match pattern="*.cs" recurse="true"/> |
124 | </Files> | 124 | </Files> |
125 | </Project> | 125 | </Project> |
126 | 126 | ||
127 | <!-- OpenGridFrameWork.Communications" --> | 127 | <!-- OpenGridFrameWork.Communications" --> |
128 | <Project name="OpenGrid.Framework.Communications" path="Common/OpenGrid.Framework.Communications" type="Library"> | 128 | <Project name="OpenGrid.Framework.Communications" path="Common/OpenGrid.Framework.Communications" type="Library"> |
129 | <Configuration name="Debug"> | 129 | <Configuration name="Debug"> |
130 | <Options> | 130 | <Options> |
131 | <OutputPath>../../bin/</OutputPath> | 131 | <OutputPath>../../bin/</OutputPath> |
@@ -140,8 +140,8 @@ | |||
140 | <ReferencePath>../../bin/</ReferencePath> | 140 | <ReferencePath>../../bin/</ReferencePath> |
141 | <Reference name="System"/> | 141 | <Reference name="System"/> |
142 | <Reference name="System.Xml"/> | 142 | <Reference name="System.Xml"/> |
143 | <Reference name="OpenSim.Framework"/> | 143 | <Reference name="OpenSim.Framework"/> |
144 | <Reference name="libsecondlife.dll"/> | 144 | <Reference name="libsecondlife.dll"/> |
145 | 145 | ||
146 | <Files> | 146 | <Files> |
147 | <Match pattern="*.cs" recurse="true"/> | 147 | <Match pattern="*.cs" recurse="true"/> |
@@ -163,16 +163,16 @@ | |||
163 | <ReferencePath>../../bin/</ReferencePath> | 163 | <ReferencePath>../../bin/</ReferencePath> |
164 | <Reference name="System"/> | 164 | <Reference name="System"/> |
165 | <Reference name="System.Xml"/> | 165 | <Reference name="System.Xml"/> |
166 | <Reference name="OpenGrid.Framework.Communications"/> | 166 | <Reference name="OpenGrid.Framework.Communications"/> |
167 | <Reference name="libsecondlife.dll"/> | 167 | <Reference name="libsecondlife.dll"/> |
168 | <Reference name="OpenSim.Framework"/> | 168 | <Reference name="OpenSim.Framework"/> |
169 | 169 | ||
170 | <Files> | 170 | <Files> |
171 | <Match pattern="*.cs" recurse="true"/> | 171 | <Match pattern="*.cs" recurse="true"/> |
172 | </Files> | 172 | </Files> |
173 | </Project> | 173 | </Project> |
174 | 174 | ||
175 | <Project name="OpenSim.Caches" path="OpenSim/OpenSim.Caches" type="Library"> | 175 | <Project name="OpenSim.Caches" path="OpenSim/OpenSim.Caches" type="Library"> |
176 | <Configuration name="Debug"> | 176 | <Configuration name="Debug"> |
177 | <Options> | 177 | <Options> |
178 | <OutputPath>../../bin/</OutputPath> | 178 | <OutputPath>../../bin/</OutputPath> |
@@ -188,7 +188,7 @@ | |||
188 | <Reference name="System"/> | 188 | <Reference name="System"/> |
189 | <Reference name="System.Xml"/> | 189 | <Reference name="System.Xml"/> |
190 | <Reference name="libsecondlife.dll"/> | 190 | <Reference name="libsecondlife.dll"/> |
191 | <Reference name="OpenSim.Framework"/> | 191 | <Reference name="OpenSim.Framework"/> |
192 | <Files> | 192 | <Files> |
193 | <Match pattern="*.cs" recurse="true"/> | 193 | <Match pattern="*.cs" recurse="true"/> |
194 | </Files> | 194 | </Files> |
@@ -219,7 +219,7 @@ | |||
219 | <Match pattern="*.cs" recurse="true"/> | 219 | <Match pattern="*.cs" recurse="true"/> |
220 | </Files> | 220 | </Files> |
221 | </Project> | 221 | </Project> |
222 | 222 | ||
223 | <Project name="OpenSim.Storage.LocalStorageSQLite" path="OpenSim/OpenSim.Storage/LocalStorageSQLite" type="Library"> | 223 | <Project name="OpenSim.Storage.LocalStorageSQLite" path="OpenSim/OpenSim.Storage/LocalStorageSQLite" type="Library"> |
224 | <Configuration name="Debug"> | 224 | <Configuration name="Debug"> |
225 | <Options> | 225 | <Options> |
@@ -319,7 +319,7 @@ | |||
319 | <Match pattern="*.cs" recurse="true"/> | 319 | <Match pattern="*.cs" recurse="true"/> |
320 | </Files> | 320 | </Files> |
321 | </Project> | 321 | </Project> |
322 | 322 | ||
323 | 323 | ||
324 | <Project name="OpenSim.Physics.Manager" path="OpenSim/OpenSim.Physics/Manager" type="Library"> | 324 | <Project name="OpenSim.Physics.Manager" path="OpenSim/OpenSim.Physics/Manager" type="Library"> |
325 | <Configuration name="Debug"> | 325 | <Configuration name="Debug"> |
@@ -352,11 +352,6 @@ | |||
352 | <OutputPath>../../../bin/Physics/</OutputPath> | 352 | <OutputPath>../../../bin/Physics/</OutputPath> |
353 | </Options> | 353 | </Options> |
354 | </Configuration> | 354 | </Configuration> |
355 | <Configuration name="Release"> | ||
356 | <Options> | ||
357 | <OutputPath>../../../bin/Physics/</OutputPath> | ||
358 | </Options> | ||
359 | </Configuration> | ||
360 | 355 | ||
361 | <ReferencePath>../../../bin/</ReferencePath> | 356 | <ReferencePath>../../../bin/</ReferencePath> |
362 | <Reference name="System" localCopy="false"/> | 357 | <Reference name="System" localCopy="false"/> |
@@ -373,11 +368,6 @@ | |||
373 | <OutputPath>../../../bin/Physics/</OutputPath> | 368 | <OutputPath>../../../bin/Physics/</OutputPath> |
374 | </Options> | 369 | </Options> |
375 | </Configuration> | 370 | </Configuration> |
376 | <Configuration name="Release"> | ||
377 | <Options> | ||
378 | <OutputPath>../../../bin/Physics/</OutputPath> | ||
379 | </Options> | ||
380 | </Configuration> | ||
381 | 371 | ||
382 | <ReferencePath>../../../bin/</ReferencePath> | 372 | <ReferencePath>../../../bin/</ReferencePath> |
383 | <Reference name="System" localCopy="false"/> | 373 | <Reference name="System" localCopy="false"/> |
@@ -395,65 +385,50 @@ | |||
395 | <OutputPath>../../../bin/Physics/</OutputPath> | 385 | <OutputPath>../../../bin/Physics/</OutputPath> |
396 | </Options> | 386 | </Options> |
397 | </Configuration> | 387 | </Configuration> |
398 | <Configuration name="Release"> | ||
399 | <Options> | ||
400 | <OutputPath>../../../bin/Physics/</OutputPath> | ||
401 | </Options> | ||
402 | </Configuration> | ||
403 | 388 | ||
404 | <ReferencePath>../../../bin/</ReferencePath> | 389 | <ReferencePath>../../../bin/</ReferencePath> |
405 | <Reference name="System" localCopy="false"/> | 390 | <Reference name="System" localCopy="false"/> |
406 | <Reference name="Axiom.MathLib.dll" localCopy="false"/> | 391 | <Reference name="Axiom.MathLib.dll" localCopy="false"/> |
407 | <Reference name="OpenSim.Physics.Manager" localCopy="false"/> | 392 | <Reference name="OpenSim.Physics.Manager" localCopy="false"/> |
408 | <Reference name="Ode.NET.dll" localCopy="false" /> | 393 | <Reference name="Ode.NET.dll" localCopy="false" /> |
409 | 394 | ||
410 | <Files> | 395 | <Files> |
411 | <Match pattern="*.cs" recurse="true"/> | 396 | <Match pattern="*.cs" recurse="true"/> |
412 | </Files> | 397 | </Files> |
413 | </Project> | 398 | </Project> |
414 | 399 | ||
415 | <!-- Xml Config Dll --> | 400 | <!-- Xml Config Dll --> |
416 | <Project name="OpenSim.GenericConfig.Xml" path="Common/OpenSim.GenericConfig/Xml" type="Library"> | 401 | <Project name="OpenSim.GenericConfig.Xml" path="Common/OpenSim.GenericConfig/Xml" type="Library"> |
417 | <Configuration name="Debug"> | 402 | <Configuration name="Debug"> |
418 | <Options> | 403 | <Options> |
419 | <OutputPath>../../../bin/</OutputPath> | 404 | <OutputPath>../../../bin/</OutputPath> |
420 | </Options> | 405 | </Options> |
421 | </Configuration> | 406 | </Configuration> |
422 | <Configuration name="Release"> | ||
423 | <Options> | ||
424 | <OutputPath>../../../bin/</OutputPath> | ||
425 | </Options> | ||
426 | </Configuration> | ||
427 | 407 | ||
428 | <ReferencePath>../../../bin/</ReferencePath> | 408 | <ReferencePath>../../../bin/</ReferencePath> |
429 | <Reference name="System"/> | 409 | <Reference name="System"/> |
430 | <Reference name="System.Xml"/> | 410 | <Reference name="System.Xml"/> |
431 | <Reference name="OpenSim.Framework"/> | 411 | <Reference name="OpenSim.Framework"/> |
432 | 412 | ||
433 | <Files> | 413 | <Files> |
434 | <Match pattern="*.cs" recurse="true"/> | 414 | <Match pattern="*.cs" recurse="true"/> |
435 | </Files> | 415 | </Files> |
436 | </Project> | 416 | </Project> |
437 | 417 | ||
438 | <!-- Terrain engine --> | 418 | <!-- Terrain engine --> |
439 | <Project name="OpenSim.Terrain.BasicTerrain" path="OpenSim/OpenSim.Terrain.BasicTerrain" type="Library"> | 419 | <Project name="OpenSim.Terrain.BasicTerrain" path="OpenSim/OpenSim.Terrain.BasicTerrain" type="Library"> |
440 | <Configuration name="Debug"> | 420 | <Configuration name="Debug"> |
441 | <Options> | 421 | <Options> |
442 | <OutputPath>../../bin/</OutputPath> | 422 | <OutputPath>../../bin/</OutputPath> |
443 | </Options> | 423 | </Options> |
444 | </Configuration> | 424 | </Configuration> |
445 | <Configuration name="Release"> | ||
446 | <Options> | ||
447 | <OutputPath>../../bin/</OutputPath> | ||
448 | </Options> | ||
449 | </Configuration> | ||
450 | 425 | ||
451 | <ReferencePath>../../bin/</ReferencePath> | 426 | <ReferencePath>../../bin/</ReferencePath> |
452 | <Reference name="System"/> | 427 | <Reference name="System"/> |
453 | <Reference name="System.Drawing"/> | 428 | <Reference name="System.Drawing"/> |
454 | <Reference name="System.Data"/> | 429 | <Reference name="System.Data"/> |
455 | <Reference name="System.Xml"/> | 430 | <Reference name="System.Xml"/> |
456 | <Reference name="libTerrain-BSD.dll"/> | 431 | <Reference name="libTerrain-BSD.dll"/> |
457 | 432 | ||
458 | <Files> | 433 | <Files> |
459 | <Match pattern="*.cs" recurse="true"/> | 434 | <Match pattern="*.cs" recurse="true"/> |
@@ -466,11 +441,6 @@ | |||
466 | <OutputPath>../../bin/</OutputPath> | 441 | <OutputPath>../../bin/</OutputPath> |
467 | </Options> | 442 | </Options> |
468 | </Configuration> | 443 | </Configuration> |
469 | <Configuration name="Release"> | ||
470 | <Options> | ||
471 | <OutputPath>../../bin/</OutputPath> | ||
472 | </Options> | ||
473 | </Configuration> | ||
474 | 444 | ||
475 | <ReferencePath>../../bin/</ReferencePath> | 445 | <ReferencePath>../../bin/</ReferencePath> |
476 | <Reference name="System" localCopy="false"/> | 446 | <Reference name="System" localCopy="false"/> |
@@ -499,11 +469,6 @@ | |||
499 | <OutputPath>../../bin/</OutputPath> | 469 | <OutputPath>../../bin/</OutputPath> |
500 | </Options> | 470 | </Options> |
501 | </Configuration> | 471 | </Configuration> |
502 | <Configuration name="Release"> | ||
503 | <Options> | ||
504 | <OutputPath>../../bin/</OutputPath> | ||
505 | </Options> | ||
506 | </Configuration> | ||
507 | 472 | ||
508 | <ReferencePath>../../bin/</ReferencePath> | 473 | <ReferencePath>../../bin/</ReferencePath> |
509 | <Reference name="System" localCopy="false"/> | 474 | <Reference name="System" localCopy="false"/> |
@@ -517,7 +482,7 @@ | |||
517 | <Reference name="OpenSim.GenericConfig.Xml"/> | 482 | <Reference name="OpenSim.GenericConfig.Xml"/> |
518 | <Reference name="OpenSim.Physics.Manager"/> | 483 | <Reference name="OpenSim.Physics.Manager"/> |
519 | <Reference name="OpenSim.Servers"/> | 484 | <Reference name="OpenSim.Servers"/> |
520 | <Reference name="OpenSim.Caches"/> | 485 | <Reference name="OpenSim.Caches"/> |
521 | <Reference name="XMLRPC"/> | 486 | <Reference name="XMLRPC"/> |
522 | <Reference name="OpenGrid.Framework.Communications"/> | 487 | <Reference name="OpenGrid.Framework.Communications"/> |
523 | 488 | ||
@@ -533,11 +498,6 @@ | |||
533 | <OutputPath>../../bin/</OutputPath> | 498 | <OutputPath>../../bin/</OutputPath> |
534 | </Options> | 499 | </Options> |
535 | </Configuration> | 500 | </Configuration> |
536 | <Configuration name="Release"> | ||
537 | <Options> | ||
538 | <OutputPath>../../bin/</OutputPath> | ||
539 | </Options> | ||
540 | </Configuration> | ||
541 | 501 | ||
542 | <ReferencePath>../../bin/</ReferencePath> | 502 | <ReferencePath>../../bin/</ReferencePath> |
543 | <Reference name="System" localCopy="false"/> | 503 | <Reference name="System" localCopy="false"/> |
@@ -550,11 +510,11 @@ | |||
550 | <Reference name="OpenSim.Framework.Console"/> | 510 | <Reference name="OpenSim.Framework.Console"/> |
551 | <Reference name="OpenSim.Physics.Manager"/> | 511 | <Reference name="OpenSim.Physics.Manager"/> |
552 | <Reference name="OpenSim.Servers"/> | 512 | <Reference name="OpenSim.Servers"/> |
553 | <Reference name="OpenSim.Region"/> | 513 | <Reference name="OpenSim.Region"/> |
554 | <Reference name="OpenSim.RegionServer"/> | 514 | <Reference name="OpenSim.RegionServer"/> |
555 | <Reference name="OpenSim.GenericConfig.Xml"/> | 515 | <Reference name="OpenSim.GenericConfig.Xml"/> |
556 | <Reference name="OpenGrid.Framework.Communications"/> | 516 | <Reference name="OpenGrid.Framework.Communications"/> |
557 | <Reference name="OpenSim.Caches"/> | 517 | <Reference name="OpenSim.Caches"/> |
558 | <Reference name="XMLRPC"/> | 518 | <Reference name="XMLRPC"/> |
559 | <Reference name="OpenSim.LocalCommunications"/> | 519 | <Reference name="OpenSim.LocalCommunications"/> |
560 | 520 | ||
@@ -562,11 +522,69 @@ | |||
562 | <Match pattern="*.cs" recurse="true"/> | 522 | <Match pattern="*.cs" recurse="true"/> |
563 | </Files> | 523 | </Files> |
564 | </Project> | 524 | </Project> |
565 | 525 | ||
566 | </Solution> | 526 | <!-- Scene Server API Example Apps --> |
567 | 527 | ||
568 | 528 | <Project name="SimpleApp" path="OpenSim/Examples/SimpleApp" type="Exe"> | |
569 | <Solution name="OpenGridServices" activeConfig="Debug" path="./"> | 529 | <Configuration name="Debug"> |
530 | <Options> | ||
531 | <OutputPath>../../../bin/</OutputPath> | ||
532 | </Options> | ||
533 | </Configuration> | ||
534 | |||
535 | <ReferencePath>../../../bin/</ReferencePath> | ||
536 | |||
537 | <Reference name="libsecondlife.dll"/> | ||
538 | <Reference name="System" localCopy="false"/> | ||
539 | <Reference name="System.Data.dll"/> | ||
540 | <Reference name="System.Xml"/> | ||
541 | |||
542 | <Reference name="OpenSim.Framework.Console"/> | ||
543 | <Reference name="OpenSim.Framework"/> | ||
544 | <Reference name="XMLRPC"/> | ||
545 | <Reference name="OpenSim.GridInterfaces.Local"/> | ||
546 | <Reference name="OpenSim.Servers"/> | ||
547 | <Reference name="OpenSim.Caches"/> | ||
548 | <Reference name="OpenSim.RegionServer"/> | ||
549 | <Reference name="OpenSim.World"/> | ||
550 | |||
551 | <Files> | ||
552 | <Match pattern="*.cs" recurse="true"/> | ||
553 | </Files> | ||
554 | </Project> | ||
555 | |||
556 | <Project name="SimpleApp2" path="OpenSim/Examples/SimpleApp2" type="Exe"> | ||
557 | <Configuration name="Debug"> | ||
558 | <Options> | ||
559 | <OutputPath>../../../bin/</OutputPath> | ||
560 | </Options> | ||
561 | </Configuration> | ||
562 | |||
563 | <ReferencePath>../../../bin/</ReferencePath> | ||
564 | |||
565 | <Reference name="libsecondlife.dll"/> | ||
566 | <Reference name="System" localCopy="false"/> | ||
567 | <Reference name="System.Data.dll"/> | ||
568 | <Reference name="System.Xml"/> | ||
569 | |||
570 | <Reference name="OpenSim.Framework.Console"/> | ||
571 | <Reference name="OpenSim.Framework"/> | ||
572 | <Reference name="XMLRPC"/> | ||
573 | <Reference name="OpenSim.GridInterfaces.Local"/> | ||
574 | <Reference name="OpenSim.Servers"/> | ||
575 | <Reference name="OpenSim.Caches"/> | ||
576 | <Reference name="OpenSim.RegionServer"/> | ||
577 | <Reference name="OpenSim.World"/> | ||
578 | |||
579 | <Files> | ||
580 | <Match pattern="*.cs" recurse="true"/> | ||
581 | </Files> | ||
582 | </Project> | ||
583 | |||
584 | </Solution> | ||
585 | |||
586 | |||
587 | <Solution name="OpenGridServices" activeConfig="Debug" path="./"> | ||
570 | <Configuration name="Debug"> | 588 | <Configuration name="Debug"> |
571 | <Options> | 589 | <Options> |
572 | <CompilerDefines>TRACE;DEBUG</CompilerDefines> | 590 | <CompilerDefines>TRACE;DEBUG</CompilerDefines> |
@@ -598,8 +616,8 @@ | |||
598 | </Options> | 616 | </Options> |
599 | </Configuration> | 617 | </Configuration> |
600 | 618 | ||
601 | 619 | ||
602 | <!-- OpenGrid Data Services --> | 620 | <!-- OpenGrid Data Services --> |
603 | <Project name="OpenGrid.Framework.Data" path="OpenGridServices/OpenGrid.Framework.Data" type="Library"> | 621 | <Project name="OpenGrid.Framework.Data" path="OpenGridServices/OpenGrid.Framework.Data" type="Library"> |
604 | <Configuration name="Debug"> | 622 | <Configuration name="Debug"> |
605 | <Options> | 623 | <Options> |
@@ -717,9 +735,9 @@ | |||
717 | </Files> | 735 | </Files> |
718 | </Project> | 736 | </Project> |
719 | 737 | ||
720 | <!-- OGS projects --> | 738 | <!-- OGS projects --> |
721 | 739 | ||
722 | <Project name="OpenGrid.Framework.Manager" path="OpenGridServices/OpenGrid.Framework.Manager" type="Library"> | 740 | <Project name="OpenGrid.Framework.Manager" path="OpenGridServices/OpenGrid.Framework.Manager" type="Library"> |
723 | <Configuration name="Debug"> | 741 | <Configuration name="Debug"> |
724 | <Options> | 742 | <Options> |
725 | <OutputPath>../../bin/</OutputPath> | 743 | <OutputPath>../../bin/</OutputPath> |
@@ -731,19 +749,19 @@ | |||
731 | </Options> | 749 | </Options> |
732 | </Configuration> | 750 | </Configuration> |
733 | 751 | ||
734 | <ReferencePath>../../bin/</ReferencePath> | 752 | <ReferencePath>../../bin/</ReferencePath> |
735 | <Reference name="System" localCopy="false"/> | 753 | <Reference name="System" localCopy="false"/> |
736 | <Reference name="OpenSim.Framework"/> | 754 | <Reference name="OpenSim.Framework"/> |
737 | <Reference name="OpenSim.Servers"/> | 755 | <Reference name="OpenSim.Servers"/> |
738 | <Reference name="libsecondlife.dll"/> | 756 | <Reference name="libsecondlife.dll"/> |
739 | <Reference name="XMLRPC"/> | 757 | <Reference name="XMLRPC"/> |
740 | 758 | ||
741 | 759 | ||
742 | <Files> | 760 | <Files> |
743 | <Match pattern="*.cs" recurse="true"/> | 761 | <Match pattern="*.cs" recurse="true"/> |
744 | </Files> | 762 | </Files> |
745 | </Project> | 763 | </Project> |
746 | 764 | ||
747 | <Project name="OpenGridServices.GridServer" path="OpenGridServices/OpenGridServices.GridServer" type="Exe"> | 765 | <Project name="OpenGridServices.GridServer" path="OpenGridServices/OpenGridServices.GridServer" type="Exe"> |
748 | <Configuration name="Debug"> | 766 | <Configuration name="Debug"> |
749 | <Options> | 767 | <Options> |
@@ -756,26 +774,26 @@ | |||
756 | </Options> | 774 | </Options> |
757 | </Configuration> | 775 | </Configuration> |
758 | 776 | ||
759 | <ReferencePath>../../bin/</ReferencePath> | 777 | <ReferencePath>../../bin/</ReferencePath> |
760 | <Reference name="System" localCopy="false"/> | 778 | <Reference name="System" localCopy="false"/> |
761 | <Reference name="System.Data" localCopy="false"/> | 779 | <Reference name="System.Data" localCopy="false"/> |
762 | <Reference name="System.Xml" localCopy="false"/> | 780 | <Reference name="System.Xml" localCopy="false"/> |
763 | <Reference name="OpenSim.Framework"/> | 781 | <Reference name="OpenSim.Framework"/> |
764 | <Reference name="OpenSim.Framework.Console"/> | 782 | <Reference name="OpenSim.Framework.Console"/> |
765 | <Reference name="OpenSim.Servers"/> | 783 | <Reference name="OpenSim.Servers"/> |
766 | <Reference name="OpenGrid.Framework.Data"/> | 784 | <Reference name="OpenGrid.Framework.Data"/> |
767 | <Reference name="OpenGrid.Framework.Manager"/> | 785 | <Reference name="OpenGrid.Framework.Manager"/> |
768 | <Reference name="OpenSim.GenericConfig.Xml"/> | 786 | <Reference name="OpenSim.GenericConfig.Xml"/> |
769 | <Reference name="libsecondlife.dll"/> | 787 | <Reference name="libsecondlife.dll"/> |
770 | <Reference name="Db4objects.Db4o.dll"/> | 788 | <Reference name="Db4objects.Db4o.dll"/> |
771 | <Reference name="XMLRPC"/> | 789 | <Reference name="XMLRPC"/> |
772 | 790 | ||
773 | <Files> | 791 | <Files> |
774 | <Match pattern="*.cs" recurse="true"/> | 792 | <Match pattern="*.cs" recurse="true"/> |
775 | </Files> | 793 | </Files> |
776 | </Project> | 794 | </Project> |
777 | 795 | ||
778 | <Project name="OpenGridServices.AssetServer" path="OpenGridServices/OpenGridServices.AssetServer" type="Exe"> | 796 | <Project name="OpenGridServices.AssetServer" path="OpenGridServices/OpenGridServices.AssetServer" type="Exe"> |
779 | <Configuration name="Debug"> | 797 | <Configuration name="Debug"> |
780 | <Options> | 798 | <Options> |
781 | <OutputPath>../../bin/</OutputPath> | 799 | <OutputPath>../../bin/</OutputPath> |
@@ -787,20 +805,20 @@ | |||
787 | </Options> | 805 | </Options> |
788 | </Configuration> | 806 | </Configuration> |
789 | 807 | ||
790 | <ReferencePath>../../bin/</ReferencePath> | 808 | <ReferencePath>../../bin/</ReferencePath> |
791 | <Reference name="System" localCopy="false"/> | 809 | <Reference name="System" localCopy="false"/> |
792 | <Reference name="System.Data" localCopy="false"/> | 810 | <Reference name="System.Data" localCopy="false"/> |
793 | <Reference name="System.Xml" localCopy="false"/> | 811 | <Reference name="System.Xml" localCopy="false"/> |
794 | <Reference name="OpenSim.Framework"/> | 812 | <Reference name="OpenSim.Framework"/> |
795 | <Reference name="OpenSim.Framework.Console"/> | 813 | <Reference name="OpenSim.Framework.Console"/> |
796 | <Reference name="OpenSim.Servers"/> | 814 | <Reference name="OpenSim.Servers"/> |
797 | <Reference name="libsecondlife.dll"/> | 815 | <Reference name="libsecondlife.dll"/> |
798 | <Reference name="Db4objects.Db4o.dll"/> | 816 | <Reference name="Db4objects.Db4o.dll"/> |
799 | <Reference name="XMLRPC"/> | 817 | <Reference name="XMLRPC"/> |
800 | 818 | ||
801 | <Files> | 819 | <Files> |
802 | <Match pattern="*.cs" recurse="true"/> | 820 | <Match pattern="*.cs" recurse="true"/> |
803 | </Files> | 821 | </Files> |
804 | </Project> | 822 | </Project> |
805 | 823 | ||
806 | <Project name="OpenGridServices.UserServer" path="OpenGridServices/OpenGridServices.UserServer" type="Exe"> | 824 | <Project name="OpenGridServices.UserServer" path="OpenGridServices/OpenGridServices.UserServer" type="Exe"> |
@@ -814,23 +832,23 @@ | |||
814 | <OutputPath>../../bin/</OutputPath> | 832 | <OutputPath>../../bin/</OutputPath> |
815 | </Options> | 833 | </Options> |
816 | </Configuration> | 834 | </Configuration> |
817 | |||
818 | <ReferencePath>../../bin/</ReferencePath> | ||
819 | <Reference name="System" localCopy="false"/> | ||
820 | <Reference name="System.Data" localCopy="false"/> | ||
821 | <Reference name="System.Xml" localCopy="false"/> | ||
822 | <Reference name="OpenSim.Framework"/> | ||
823 | <Reference name="OpenSim.Framework.Console"/> | ||
824 | <Reference name="OpenGrid.Framework.Data"/> | ||
825 | <Reference name="OpenSim.GenericConfig.Xml"/> | ||
826 | <Reference name="OpenSim.Servers"/> | ||
827 | <Reference name="libsecondlife.dll"/> | ||
828 | <Reference name="Db4objects.Db4o.dll"/> | ||
829 | <Reference name="XMLRPC"/> | ||
830 | 835 | ||
831 | <Files> | 836 | <ReferencePath>../../bin/</ReferencePath> |
832 | <Match pattern="*.cs" recurse="true"/> | 837 | <Reference name="System" localCopy="false"/> |
833 | </Files> | 838 | <Reference name="System.Data" localCopy="false"/> |
839 | <Reference name="System.Xml" localCopy="false"/> | ||
840 | <Reference name="OpenSim.Framework"/> | ||
841 | <Reference name="OpenSim.Framework.Console"/> | ||
842 | <Reference name="OpenGrid.Framework.Data"/> | ||
843 | <Reference name="OpenSim.GenericConfig.Xml"/> | ||
844 | <Reference name="OpenSim.Servers"/> | ||
845 | <Reference name="libsecondlife.dll"/> | ||
846 | <Reference name="Db4objects.Db4o.dll"/> | ||
847 | <Reference name="XMLRPC"/> | ||
848 | |||
849 | <Files> | ||
850 | <Match pattern="*.cs" recurse="true"/> | ||
851 | </Files> | ||
834 | </Project> | 852 | </Project> |
835 | 853 | ||
836 | 854 | ||
@@ -866,11 +884,6 @@ | |||
866 | <OutputPath>../../../bin/</OutputPath> | 884 | <OutputPath>../../../bin/</OutputPath> |
867 | </Options> | 885 | </Options> |
868 | </Configuration> | 886 | </Configuration> |
869 | <Configuration name="Release"> | ||
870 | <Options> | ||
871 | <OutputPath>../../../bin/</OutputPath> | ||
872 | </Options> | ||
873 | </Configuration> | ||
874 | 887 | ||
875 | <ReferencePath>../../../bin/</ReferencePath> | 888 | <ReferencePath>../../../bin/</ReferencePath> |
876 | <Reference name="System" localCopy="false"/> | 889 | <Reference name="System" localCopy="false"/> |
@@ -884,10 +897,9 @@ | |||
884 | <Match pattern="*.cs" recurse="true"/> | 897 | <Match pattern="*.cs" recurse="true"/> |
885 | </Files> | 898 | </Files> |
886 | </Project> | 899 | </Project> |
887 | 900 | </Solution> | |
888 | </Solution> | 901 | |
889 | 902 | ||
890 | |||
891 | <!-- Prebuild tool --> | 903 | <!-- Prebuild tool --> |
892 | <Solution name="Prebuild" path="Prebuild/" > | 904 | <Solution name="Prebuild" path="Prebuild/" > |
893 | <Configuration name="Debug"> | 905 | <Configuration name="Debug"> |
@@ -899,15 +911,6 @@ | |||
899 | <SuppressWarnings>1595</SuppressWarnings> | 911 | <SuppressWarnings>1595</SuppressWarnings> |
900 | </Options> | 912 | </Options> |
901 | </Configuration> | 913 | </Configuration> |
902 | <Configuration name="Release"> | ||
903 | <Options> | ||
904 | <CompilerDefines>TRACE</CompilerDefines> | ||
905 | <OutputPath>bin/Release</OutputPath> | ||
906 | <OptimizeCode>true</OptimizeCode> | ||
907 | <DebugInformation>false</DebugInformation> | ||
908 | <SuppressWarnings>1595</SuppressWarnings> | ||
909 | </Options> | ||
910 | </Configuration> | ||
911 | <Project name="Prebuild" path="src/" language="C#" assemblyName="Prebuild" icon="App.ico" type="Exe" rootNamespace="Prebuild" startupObject="Prebuild.Prebuild"> | 914 | <Project name="Prebuild" path="src/" language="C#" assemblyName="Prebuild" icon="App.ico" type="Exe" rootNamespace="Prebuild" startupObject="Prebuild.Prebuild"> |
912 | <Configuration name="Debug"> | 915 | <Configuration name="Debug"> |
913 | <Options> | 916 | <Options> |
@@ -919,16 +922,6 @@ | |||
919 | <SuppressWarnings>1595</SuppressWarnings> | 922 | <SuppressWarnings>1595</SuppressWarnings> |
920 | </Options> | 923 | </Options> |
921 | </Configuration> | 924 | </Configuration> |
922 | <Configuration name="Release"> | ||
923 | <Options> | ||
924 | <CompilerDefines>TRACE</CompilerDefines> | ||
925 | <OutputPath>..\..\bin\</OutputPath> | ||
926 | <OptimizeCode>true</OptimizeCode> | ||
927 | <DebugInformation>false</DebugInformation> | ||
928 | <KeyFile>Prebuild.snk</KeyFile> | ||
929 | <SuppressWarnings>1595</SuppressWarnings> | ||
930 | </Options> | ||
931 | </Configuration> | ||
932 | <ReferencePath>../../bin/</ReferencePath> | 925 | <ReferencePath>../../bin/</ReferencePath> |
933 | <Reference name="System.EnterpriseServices" /> | 926 | <Reference name="System.EnterpriseServices" /> |
934 | <Reference name="System.Xml" /> | 927 | <Reference name="System.Xml" /> |