From 5d59ffe99d7c592d87361e3bb1b1ac152bf5980c Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Sun, 17 Jun 2007 16:49:33 +0000 Subject: * Added the two Sample Apps to the solution * Made them build * They don't work though, gotta have a look see at that later. * ignored a shitload of bins --- .../Xml/OpenSim.GenericConfig.Xml.csproj | 2 +- .../OpenUser.Config.UserConfigDb4o.csproj | 2 +- OpenSim.build | 6 + OpenSim.sln | 14 +- OpenSim/Examples/SimpleApp/MyWorld.cs | 2 +- OpenSim/Examples/SimpleApp/Program.cs | 18 +- OpenSim/Examples/SimpleApp/SimpleApp.csproj | 168 +++++++---- OpenSim/Examples/SimpleApp/SimpleApp.exe.build | 52 ++++ OpenSim/Examples/SimpleApp2/MyClientView.cs | 3 +- OpenSim/Examples/SimpleApp2/MyPacketServer.cs | 6 +- OpenSim/Examples/SimpleApp2/Program.cs | 12 +- OpenSim/Examples/SimpleApp2/SimpleApp2.csproj | 172 +++++++---- OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build | 53 ++++ .../OpenSim.LocalCommunications.csproj.user | 2 +- .../OpenSim.Physics.BasicPhysicsPlugin.csproj | 2 +- .../OdePlugin/OpenSim.Physics.OdePlugin.csproj | 2 +- .../PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj | 2 +- OpenSim/OpenSim.Region/OpenSim.Region.csproj | 2 +- .../OpenSim.RegionServer.csproj | 2 +- .../OpenSim.Terrain.BasicTerrain.csproj | 2 +- OpenSim/OpenSim/OpenSim.csproj | 2 +- Prebuild/Prebuild.build | 7 - Prebuild/Prebuild.sln | 3 - Prebuild/src/Prebuild.csproj | 18 -- prebuild.xml | 317 ++++++++++----------- 25 files changed, 542 insertions(+), 329 deletions(-) create mode 100644 OpenSim/Examples/SimpleApp/SimpleApp.exe.build create mode 100644 OpenSim/Examples/SimpleApp2/SimpleApp2.exe.build 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 @@ False 4096 True - ..\..\..\bin\ + bin\ False False False 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 @@ False 4096 True - ..\..\..\bin\ + bin\ False False False diff --git a/OpenSim.build b/OpenSim.build index 711c7c4..9eb05c7 100644 --- a/OpenSim.build +++ b/OpenSim.build @@ -66,6 +66,8 @@ + + @@ -91,6 +93,8 @@ + + @@ -121,6 +125,8 @@ + + diff --git a/OpenSim.sln b/OpenSim.sln index 2c1b58f..e854bb6 100644 --- a/OpenSim.sln +++ b/OpenSim.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual C# Express 2005 +# Visual Studio 2005 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Communications", "Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj", "{683344D5-0000-0000-0000-000000000000}" EndProject 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 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp", "OpenSim\Examples\SimpleApp\SimpleApp.csproj", "{24B12448-0000-0000-0000-000000000000}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApp2", "OpenSim\Examples\SimpleApp2\SimpleApp2.csproj", "{24DF2448-0000-0000-0000-000000000000}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" EndProject Global @@ -128,6 +132,14 @@ Global {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {24B12448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {24B12448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {24DF2448-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {24DF2448-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {24DF2448-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {24DF2448-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {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 client.OnCompleteMovementToRegion += delegate() { - client.MoveAgentIntoRegion(m_regionInfo); + client.MoveAgentIntoRegion(m_regionInfo, pos, LLVector3.Zero ); }; client.OnCompleteMovementToRegion += delegate() diff --git a/OpenSim/Examples/SimpleApp/Program.cs b/OpenSim/Examples/SimpleApp/Program.cs index e44bdba..b3b04ab 100644 --- a/OpenSim/Examples/SimpleApp/Program.cs +++ b/OpenSim/Examples/SimpleApp/Program.cs @@ -2,16 +2,17 @@ using System; using System.Collections.Generic; using System.Text; using OpenSim; -using OpenSim.Servers; using OpenSim.GridInterfaces.Local; using OpenSim.Framework.Interfaces; using OpenSim.Framework.Types; -using OpenSim.UserServer; using OpenSim.Framework.Console; using OpenSim.world; -using OpenSim.Physics.Manager; using OpenSim.Assets; using libsecondlife; +using OpenSim.UserServer; +using OpenSim.Servers; +using OpenSim.Framework; +using OpenSim.Caches; namespace SimpleApp { @@ -32,9 +33,9 @@ namespace SimpleApp LoginServer loginServer = new LoginServer( simAddr, simPort, 0, 0, false ); loginServer.Startup(); - - AuthenticateSessionsLocal localSessions = new AuthenticateSessionsLocal(); - loginServer.SetSessionHandler(localSessions.AddNewSessionHandler ); + loginServer.SetSessionHandler( AddNewSessionHandler ); + + AuthenticateSessionsBase localSessions = new AuthenticateSessionsBase(); InventoryCache inventoryCache = new InventoryCache(); @@ -67,9 +68,10 @@ namespace SimpleApp m_console.ReadLine(); } - private void AddNewSessionHandler(Login loginData) + private bool AddNewSessionHandler(ulong regionHandle, Login loginData) { - m_console.WriteLine( LogPriority.NORMAL, "Recieved Login from [{0}] [{1}]", loginData.First, loginData.Last ); + m_console.WriteLine( LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last ); + return true; } #region IAssetReceiver Members diff --git a/OpenSim/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Examples/SimpleApp/SimpleApp.csproj index 51e14de..f7cca86 100644 --- a/OpenSim/Examples/SimpleApp/SimpleApp.csproj +++ b/OpenSim/Examples/SimpleApp/SimpleApp.csproj @@ -1,86 +1,144 @@ - + - Debug - AnyCPU + Local 8.0.50727 2.0 - {AD062D99-DD53-4D37-A4B8-2AF635377AEB} + {24B12448-0000-0000-0000-000000000000} + Debug + AnyCPU + + + + SimpleApp + JScript + Grid + IE50 + false Exe - Properties + SimpleApp - SimpleApp + + + - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt + False + 285212672 + False + + + TRACE;DEBUG + + True + 4096 + False + ..\..\..\bin\ + False + False + False 4 + - pdbonly - true - bin\Release\ + False + 285212672 + False + + TRACE - prompt + + False + 4096 + True + bin\ + False + False + False 4 + - - False + ..\..\..\bin\libsecondlife.dll + False + + + OpenSim.World.dll + False + + + System.dll + False + + + ..\..\..\bin\System.Data.dll + False + + + System.Xml.dll + False - - - - - - - - - - {A7CD0630-0000-0000-0000-000000000000} - OpenSim.Framework.Console + + OpenSim.Caches + {1938EB12-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False - {8ACA2445-0000-0000-0000-000000000000} OpenSim.Framework + {8ACA2445-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False - - {8BB20F0A-0000-0000-0000-000000000000} - OpenSim.Servers - - - {8E81D43C-0000-0000-0000-000000000000} - XMLRPC + + OpenSim.Framework.Console + {A7CD0630-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False - {546099CD-0000-0000-0000-000000000000} OpenSim.GridInterfaces.Local - - - {8BE16150-0000-0000-0000-000000000000} - OpenSim.Physics.Manager + {546099CD-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False - {632E1BFD-0000-0000-0000-000000000000} OpenSim.RegionServer + {632E1BFD-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False - - {642A14A8-0000-0000-0000-000000000000} - OpenSim.World + + OpenSim.Servers + {8BB20F0A-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + + + XMLRPC + {8E81D43C-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False - - - \ No newline at end of file + + + Code + + + Code + + + Code + + + + + + + + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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; using OpenSim.Assets; using OpenSim.Framework.Types; using OpenSim.Framework; +using OpenSim.Caches; namespace SimpleApp2 { @@ -40,7 +41,7 @@ namespace SimpleApp2 { LLVector3 pos = new LLVector3(128, 128, 128); - MoveAgentIntoRegion(m_world.RegionInfo); + MoveAgentIntoRegion(m_world.RegionInfo, pos, LLVector3.Zero ); SendAvatarData( m_world.RegionInfo, FirstName, 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; using libsecondlife.Packets; using OpenSim.Framework.Interfaces; using OpenSim.Framework; +using OpenSim.Caches; namespace SimpleApp2 { public class MyPacketServer : PacketServer { private float[] m_map; - - public MyPacketServer(float[] map, OpenSimNetworkHandler networkHandler, uint port ) : base( networkHandler, port ) + + public MyPacketServer(float[] map, ClientStackNetworkHandler networkHandler, uint port) + : base(networkHandler, port) { m_map = map; } 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; using OpenSim.UserServer; using OpenSim.Framework.Console; using OpenSim.world; -using OpenSim.Physics.Manager; using OpenSim.Assets; using libsecondlife; +using OpenSim.Framework; +using OpenSim.Caches; namespace SimpleApp2 { @@ -37,8 +38,8 @@ namespace SimpleApp2 LoginServer loginServer = new LoginServer(simAddr, simPort, 0, 0, false); loginServer.Startup(); - AuthenticateSessionsLocal localSessions = new AuthenticateSessionsLocal(); - loginServer.SetSessionHandler(localSessions.AddNewSessionHandler); + AuthenticateSessionsBase localSessions = new AuthenticateSessionsBase(); + loginServer.SetSessionHandler( AddNewSessionHandler ); InventoryCache inventoryCache = new InventoryCache(); @@ -86,9 +87,10 @@ namespace SimpleApp2 return map; } - private void AddNewSessionHandler(Login loginData) + private bool AddNewSessionHandler(ulong regionHandle, Login loginData) { - m_console.WriteLine(LogPriority.NORMAL, "Recieved Login from [{0}] [{1}]", loginData.First, loginData.Last); + m_console.WriteLine(LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last); + return true; } 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 @@ - + - Debug - AnyCPU + Local 8.0.50727 2.0 - {C84B2171-D386-4377-B490-9C5A56674B9E} + {24DF2448-0000-0000-0000-000000000000} + Debug + AnyCPU + + + + SimpleApp2 + JScript + Grid + IE50 + false Exe - Properties + SimpleApp2 - SimpleApp2 + + + - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt + False + 285212672 + False + + + TRACE;DEBUG + + True + 4096 + False + ..\..\..\bin\ + False + False + False 4 + - pdbonly - true - bin\Release\ + False + 285212672 + False + + TRACE - prompt + + False + 4096 + True + bin\ + False + False + False 4 + - - False + ..\..\..\bin\libsecondlife.dll + False + + + OpenSim.World.dll + False + + + System.dll + False + + + ..\..\..\bin\System.Data.dll + False + + + System.Xml.dll + False - - - - - - - - - - - {A7CD0630-0000-0000-0000-000000000000} - OpenSim.Framework.Console + + OpenSim.Caches + {1938EB12-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False - {8ACA2445-0000-0000-0000-000000000000} OpenSim.Framework + {8ACA2445-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False - - {8BB20F0A-0000-0000-0000-000000000000} - OpenSim.Servers - - - {8E81D43C-0000-0000-0000-000000000000} - XMLRPC + + OpenSim.Framework.Console + {A7CD0630-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False - {546099CD-0000-0000-0000-000000000000} OpenSim.GridInterfaces.Local - - - {8BE16150-0000-0000-0000-000000000000} - OpenSim.Physics.Manager + {546099CD-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False - {632E1BFD-0000-0000-0000-000000000000} OpenSim.RegionServer + {632E1BFD-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False - - {642A14A8-0000-0000-0000-000000000000} - OpenSim.World + + OpenSim.Servers + {8BB20F0A-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + + + XMLRPC + {8E81D43C-0000-0000-0000-000000000000} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False - - - \ No newline at end of file + + + Code + + + Code + + + Code + + + Code + + + + + + + + + + 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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ Debug AnyCPU - C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\Sugilite\bin\ + C:\Documents and Settings\Stefan\My Documents\source\opensim\branches\Sugilite\bin\ 8.0.50727 ProjectFiles 0 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 @@ False 4096 True - ..\..\..\bin\Physics\ + bin\ False False False 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 @@ False 4096 True - ..\..\..\bin\Physics\ + bin\ False False False 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 @@ False 4096 True - ..\..\..\bin\Physics\ + bin\ False False False 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 @@ False 4096 True - ..\..\bin\ + bin\ False False False 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 @@ False 4096 True - ..\..\bin\ + bin\ False False False 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 @@ False 4096 True - ..\..\bin\ + bin\ False False False 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 @@ False 4096 True - ..\..\bin\ + bin\ False False False 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 @@ - - - - - - - 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 Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU - {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution 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 @@ 4 1595 - - False - 285212672 - False - - - TRACE - - False - 4096 - True - ..\..\bin\ - False - False - False - 4 - 1595 - System.dll diff --git a/prebuild.xml b/prebuild.xml index a66dab4..95600f8 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -33,7 +33,7 @@ - + ../../bin/ @@ -93,7 +93,7 @@ - + @@ -114,18 +114,18 @@ ../../bin/ - - - - + + + + - - + + ../../bin/ @@ -140,8 +140,8 @@ ../../bin/ - - + + @@ -163,16 +163,16 @@ ../../bin/ - - - + + + - + ../../bin/ @@ -188,7 +188,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -319,7 +319,7 @@ - + @@ -352,11 +352,6 @@ ../../../bin/Physics/ - - - ../../../bin/Physics/ - - ../../../bin/ @@ -373,11 +368,6 @@ ../../../bin/Physics/ - - - ../../../bin/Physics/ - - ../../../bin/ @@ -395,65 +385,50 @@ ../../../bin/Physics/ - - - ../../../bin/Physics/ - - ../../../bin/ - + - - + + ../../../bin/ - - - ../../../bin/ - - ../../../bin/ - + - - + + ../../bin/ - - - ../../bin/ - - ../../bin/ - + @@ -466,11 +441,6 @@ ../../bin/ - - - ../../bin/ - - ../../bin/ @@ -499,11 +469,6 @@ ../../bin/ - - - ../../bin/ - - ../../bin/ @@ -517,7 +482,7 @@ - + @@ -533,11 +498,6 @@ ../../bin/ - - - ../../bin/ - - ../../bin/ @@ -550,11 +510,11 @@ - + - - + + @@ -562,11 +522,69 @@ - - - - - + + + + + + + ../../../bin/ + + + + ../../../bin/ + + + + + + + + + + + + + + + + + + + + + + + + ../../../bin/ + + + + ../../../bin/ + + + + + + + + + + + + + + + + + + + + + + + + TRACE;DEBUG @@ -598,8 +616,8 @@ - - + + @@ -717,9 +735,9 @@ - - - + + + ../../bin/ @@ -731,19 +749,19 @@ - ../../bin/ - - - - - + ../../bin/ + + + + + - - - + + + - + @@ -756,26 +774,26 @@ - ../../bin/ - - - - - - - - - - - - + ../../bin/ + + + + + + + + + + + + - - - + + + - + ../../bin/ @@ -787,20 +805,20 @@ - ../../bin/ - - - - - - - - - + ../../bin/ + + + + + + + + + - - - + + + @@ -814,23 +832,23 @@ ../../bin/ - - ../../bin/ - - - - - - - - - - - - - - + ../../bin/ + + + + + + + + + + + + + + + @@ -866,11 +884,6 @@ ../../../bin/ - - - ../../../bin/ - - ../../../bin/ @@ -884,10 +897,9 @@ - - - - + + + @@ -899,15 +911,6 @@ 1595 - - - TRACE - bin/Release - true - false - 1595 - - @@ -919,16 +922,6 @@ 1595 - - - TRACE - ..\..\bin\ - true - false - Prebuild.snk - 1595 - - ../../bin/ -- cgit v1.1