From 9ea0e881a45701782240013c8f17dfad7e5ab463 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Thu, 29 Mar 2007 17:29:52 +0000 Subject: [PATCH] * Naaw, -realphysx is too much to ask * Genning proj Guids from name hash, for great justice --- .../OpenGridServices.GridServer.csproj | 4 +- .../OpenGridServices.UserServer.csproj | 4 +- .../OpenSim.Config.SimConfigDb4o.csproj | 6 +- .../OpenSim.Framework.Console.csproj | 2 +- OpenSim.Framework/OpenSim.Framework.csproj | 2 +- .../Local/OpenSim.GridInterfaces.Local.csproj | 6 +- .../OpenSim.GridInterfaces.Remote.csproj | 6 +- .../OpenSim.Physics.BasicPhysicsPlugin.csproj | 4 +- .../Manager/OpenSim.Physics.Manager.csproj | 6 +- .../OpenSim.Physics.OdePlugin.csproj | 4 +- .../OpenSim.Physics.PhysXPlugin.csproj | 4 +- .../OpenSim.RegionServer.csproj | 58 +++--- .../OpenSim.Storage.LocalStorageDb4o.csproj | 6 +- OpenSim.sln | 195 ++++++++++-------- OpenSim/OpenSim.csproj | 10 +- Prebuild/Prebuild.sln | 28 +-- Prebuild/src/Core/Nodes/ProjectNode.cs | 6 +- Prebuild/src/Core/Targets/VS2005Target.cs | 2 +- Prebuild/src/Prebuild.csproj | 2 +- Servers/OpenSim.Servers.csproj | 49 +++-- bin/Prebuild.exe | Bin 176128 -> 176128 bytes 21 files changed, 212 insertions(+), 192 deletions(-) diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj index 378d2610ed..3705912159 100644 --- a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj +++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {0CE4ED02-8BB2-439C-8225-E42F2D661D44} + {21BFC8E2-0000-0000-0000-000000000000} Debug AnyCPU @@ -82,7 +82,7 @@ OpenSim.Framework.Console - {4B0A7290-36C2-4C74-B9B4-07775B031CF2} + {A7CD0630-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj index c27c0f7e08..e82379374f 100644 --- a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj +++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {98EC7DD5-BAB2-4678-AEA1-7C2B27B27BC9} + {66591469-0000-0000-0000-000000000000} Debug AnyCPU @@ -82,7 +82,7 @@ OpenSim.Framework.Console - {4B0A7290-36C2-4C74-B9B4-07775B031CF2} + {A7CD0630-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj index c3486052d8..e15551bb63 100644 --- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj +++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {A6463B2D-0956-4680-9D03-082199779C66} + {83C87BE6-0000-0000-0000-000000000000} Debug AnyCPU @@ -82,13 +82,13 @@ OpenSim.Framework - {BD7866A4-04BA-47F0-905F-B2359118F5B2} + {8ACA2445-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {4B0A7290-36C2-4C74-B9B4-07775B031CF2} + {A7CD0630-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj index 3572f4af09..096149217b 100644 --- a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj +++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {4B0A7290-36C2-4C74-B9B4-07775B031CF2} + {A7CD0630-0000-0000-0000-000000000000} Debug AnyCPU diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj index 014dd57686..575d0ad8de 100644 --- a/OpenSim.Framework/OpenSim.Framework.csproj +++ b/OpenSim.Framework/OpenSim.Framework.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {BD7866A4-04BA-47F0-905F-B2359118F5B2} + {8ACA2445-0000-0000-0000-000000000000} Debug AnyCPU diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj index 4401b969e1..1aec5aa1e2 100644 --- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj +++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {CBC22F47-9CF2-4748-B6C6-85CDAB267554} + {546099CD-0000-0000-0000-000000000000} Debug AnyCPU @@ -78,13 +78,13 @@ OpenSim.Framework - {BD7866A4-04BA-47F0-905F-B2359118F5B2} + {8ACA2445-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {4B0A7290-36C2-4C74-B9B4-07775B031CF2} + {A7CD0630-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj index a8a676089f..2b804565a6 100644 --- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj +++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {76C00C0A-1AEF-49C9-8E4E-19A529B364E8} + {B55C0B5D-0000-0000-0000-000000000000} Debug AnyCPU @@ -74,13 +74,13 @@ OpenSim.Framework - {BD7866A4-04BA-47F0-905F-B2359118F5B2} + {8ACA2445-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {4B0A7290-36C2-4C74-B9B4-07775B031CF2} + {A7CD0630-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj index ec632b16c1..6d5b4d03d6 100644 --- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj +++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {E168B13F-8D18-43E7-8546-C0EC1899579F} + {4F874463-0000-0000-0000-000000000000} Debug AnyCPU @@ -70,7 +70,7 @@ OpenSim.Physics.Manager - {2EAB18A1-8187-4C79-9947-A671F9C007D9} + {8BE16150-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj index b4679a91c9..294e005304 100644 --- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj +++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {2EAB18A1-8187-4C79-9947-A671F9C007D9} + {8BE16150-0000-0000-0000-000000000000} Debug AnyCPU @@ -74,13 +74,13 @@ OpenSim.Framework - {BD7866A4-04BA-47F0-905F-B2359118F5B2} + {8ACA2445-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {4B0A7290-36C2-4C74-B9B4-07775B031CF2} + {A7CD0630-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj index 6fd3e8c94f..68f1aa1c4f 100644 --- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj +++ b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {F23A90E8-FDED-4D8C-A1B9-2ABE0A8C8EB2} + {63A05FE9-0000-0000-0000-000000000000} Debug AnyCPU @@ -74,7 +74,7 @@ OpenSim.Physics.Manager - {2EAB18A1-8187-4C79-9947-A671F9C007D9} + {8BE16150-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj index 8d36b0049f..efe9c79c3b 100644 --- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj +++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {0EF13F92-86F1-403D-882A-AA9DD4421B32} + {988F0AC4-0000-0000-0000-000000000000} Debug AnyCPU @@ -74,7 +74,7 @@ OpenSim.Physics.Manager - {2EAB18A1-8187-4C79-9947-A671F9C007D9} + {8BE16150-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 13b976778a..bc736b04b7 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj @@ -1,13 +1,12 @@ - + Local 8.0.50727 2.0 - {ADD974E2-994C-4998-864E-4B54D8AD5F00} + {632E1BFD-0000-0000-0000-000000000000} Debug AnyCPU - - + OpenSim.RegionServer @@ -16,11 +15,9 @@ IE50 false Library - - + OpenSim.RegionServer - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,28 +55,26 @@ False False 4 - - + - + System.dll False - - + System.Xml.dll False - + ..\bin\libsecondlife.dll False - + ..\bin\Axiom.MathLib.dll False - + ..\bin\Db4objects.Db4o.dll False @@ -90,27 +82,27 @@ OpenSim.Framework - {BD7866A4-04BA-47F0-905F-B2359118F5B2} + {8ACA2445-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.Framework.Console - {4B0A7290-36C2-4C74-B9B4-07775B031CF2} + {A7CD0630-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.Physics.Manager - {2EAB18A1-8187-4C79-9947-A671F9C007D9} + {8BE16150-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.Servers - {B9D6A5F0-3BD2-4161-8AF1-90C03295D4EE} + {8BB20F0A-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False @@ -123,10 +115,10 @@ Code - + Code - + Code @@ -194,4 +186,4 @@ - \ No newline at end of file + diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj index 024dcfc496..b1f4fb7315 100644 --- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj +++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {55969A66-0E92-4F76-BFF6-2256C6A5CAF7} + {E1B79ECF-0000-0000-0000-000000000000} Debug AnyCPU @@ -78,13 +78,13 @@ OpenSim.Framework - {BD7866A4-04BA-47F0-905F-B2359118F5B2} + {8ACA2445-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {4B0A7290-36C2-4C74-B9B4-07775B031CF2} + {A7CD0630-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.sln b/OpenSim.sln index 5e07615f67..68d6763654 100644 --- a/OpenSim.sln +++ b/OpenSim.sln @@ -1,103 +1,130 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "Servers\OpenSim.Servers.csproj", "{B9D6A5F0-3BD2-4161-8AF1-90C03295D4EE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "Servers\OpenSim.Servers.csproj", "{8BB20F0A-0000-0000-0000-000000000000}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{4B0A7290-36C2-4C74-B9B4-07775B031CF2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{A6463B2D-0956-4680-9D03-082199779C66}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{83C87BE6-0000-0000-0000-000000000000}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{98EC7DD5-BAB2-4678-AEA1-7C2B27B27BC9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{66591469-0000-0000-0000-000000000000}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{76C00C0A-1AEF-49C9-8E4E-19A529B364E8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{B55C0B5D-0000-0000-0000-000000000000}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{55969A66-0E92-4F76-BFF6-2256C6A5CAF7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{E1B79ECF-0000-0000-0000-000000000000}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{BD7866A4-04BA-47F0-905F-B2359118F5B2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{0CE4ED02-8BB2-439C-8225-E42F2D661D44}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{F23A90E8-FDED-4D8C-A1B9-2ABE0A8C8EB2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{63A05FE9-0000-0000-0000-000000000000}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{E168B13F-8D18-43E7-8546-C0EC1899579F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{4F874463-0000-0000-0000-000000000000}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{8B0B16BC-D9D0-4200-8FEF-6B12AA896EC1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{ADD974E2-994C-4998-864E-4B54D8AD5F00}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{632E1BFD-0000-0000-0000-000000000000}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{2EAB18A1-8187-4C79-9947-A671F9C007D9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{8BE16150-0000-0000-0000-000000000000}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{CBC22F47-9CF2-4748-B6C6-85CDAB267554}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{546099CD-0000-0000-0000-000000000000}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{0EF13F92-86F1-403D-882A-AA9DD4421B32}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{988F0AC4-0000-0000-0000-000000000000}" EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B9D6A5F0-3BD2-4161-8AF1-90C03295D4EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B9D6A5F0-3BD2-4161-8AF1-90C03295D4EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B9D6A5F0-3BD2-4161-8AF1-90C03295D4EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B9D6A5F0-3BD2-4161-8AF1-90C03295D4EE}.Release|Any CPU.Build.0 = Release|Any CPU - {4B0A7290-36C2-4C74-B9B4-07775B031CF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B0A7290-36C2-4C74-B9B4-07775B031CF2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B0A7290-36C2-4C74-B9B4-07775B031CF2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B0A7290-36C2-4C74-B9B4-07775B031CF2}.Release|Any CPU.Build.0 = Release|Any CPU - {A6463B2D-0956-4680-9D03-082199779C66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6463B2D-0956-4680-9D03-082199779C66}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6463B2D-0956-4680-9D03-082199779C66}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6463B2D-0956-4680-9D03-082199779C66}.Release|Any CPU.Build.0 = Release|Any CPU - {98EC7DD5-BAB2-4678-AEA1-7C2B27B27BC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {98EC7DD5-BAB2-4678-AEA1-7C2B27B27BC9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {98EC7DD5-BAB2-4678-AEA1-7C2B27B27BC9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {98EC7DD5-BAB2-4678-AEA1-7C2B27B27BC9}.Release|Any CPU.Build.0 = Release|Any CPU - {76C00C0A-1AEF-49C9-8E4E-19A529B364E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76C00C0A-1AEF-49C9-8E4E-19A529B364E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76C00C0A-1AEF-49C9-8E4E-19A529B364E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76C00C0A-1AEF-49C9-8E4E-19A529B364E8}.Release|Any CPU.Build.0 = Release|Any CPU - {55969A66-0E92-4F76-BFF6-2256C6A5CAF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55969A66-0E92-4F76-BFF6-2256C6A5CAF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55969A66-0E92-4F76-BFF6-2256C6A5CAF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55969A66-0E92-4F76-BFF6-2256C6A5CAF7}.Release|Any CPU.Build.0 = Release|Any CPU - {BD7866A4-04BA-47F0-905F-B2359118F5B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD7866A4-04BA-47F0-905F-B2359118F5B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD7866A4-04BA-47F0-905F-B2359118F5B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD7866A4-04BA-47F0-905F-B2359118F5B2}.Release|Any CPU.Build.0 = Release|Any CPU - {0CE4ED02-8BB2-439C-8225-E42F2D661D44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0CE4ED02-8BB2-439C-8225-E42F2D661D44}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0CE4ED02-8BB2-439C-8225-E42F2D661D44}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0CE4ED02-8BB2-439C-8225-E42F2D661D44}.Release|Any CPU.Build.0 = Release|Any CPU - {F23A90E8-FDED-4D8C-A1B9-2ABE0A8C8EB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F23A90E8-FDED-4D8C-A1B9-2ABE0A8C8EB2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F23A90E8-FDED-4D8C-A1B9-2ABE0A8C8EB2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F23A90E8-FDED-4D8C-A1B9-2ABE0A8C8EB2}.Release|Any CPU.Build.0 = Release|Any CPU - {E168B13F-8D18-43E7-8546-C0EC1899579F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E168B13F-8D18-43E7-8546-C0EC1899579F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E168B13F-8D18-43E7-8546-C0EC1899579F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E168B13F-8D18-43E7-8546-C0EC1899579F}.Release|Any CPU.Build.0 = Release|Any CPU - {8B0B16BC-D9D0-4200-8FEF-6B12AA896EC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B0B16BC-D9D0-4200-8FEF-6B12AA896EC1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B0B16BC-D9D0-4200-8FEF-6B12AA896EC1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B0B16BC-D9D0-4200-8FEF-6B12AA896EC1}.Release|Any CPU.Build.0 = Release|Any CPU - {ADD974E2-994C-4998-864E-4B54D8AD5F00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ADD974E2-994C-4998-864E-4B54D8AD5F00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ADD974E2-994C-4998-864E-4B54D8AD5F00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ADD974E2-994C-4998-864E-4B54D8AD5F00}.Release|Any CPU.Build.0 = Release|Any CPU - {2EAB18A1-8187-4C79-9947-A671F9C007D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2EAB18A1-8187-4C79-9947-A671F9C007D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2EAB18A1-8187-4C79-9947-A671F9C007D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2EAB18A1-8187-4C79-9947-A671F9C007D9}.Release|Any CPU.Build.0 = Release|Any CPU - {CBC22F47-9CF2-4748-B6C6-85CDAB267554}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CBC22F47-9CF2-4748-B6C6-85CDAB267554}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CBC22F47-9CF2-4748-B6C6-85CDAB267554}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CBC22F47-9CF2-4748-B6C6-85CDAB267554}.Release|Any CPU.Build.0 = Release|Any CPU - {0EF13F92-86F1-403D-882A-AA9DD4421B32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0EF13F92-86F1-403D-882A-AA9DD4421B32}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0EF13F92-86F1-403D-882A-AA9DD4421B32}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0EF13F92-86F1-403D-882A-AA9DD4421B32}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) + ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) + ({83C87BE6-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) + ({83C87BE6-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) + ({66591469-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) + ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) + ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) + ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) + ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) + ({21BFC8E2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) + ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) + ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) + ({438A9556-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) + ({438A9556-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) + ({438A9556-0000-0000-0000-000000000000}).7 = ({8BE16150-0000-0000-0000-000000000000}) + ({438A9556-0000-0000-0000-000000000000}).8 = ({632E1BFD-0000-0000-0000-000000000000}) + ({632E1BFD-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) + ({632E1BFD-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) + ({632E1BFD-0000-0000-0000-000000000000}).7 = ({8BE16150-0000-0000-0000-000000000000}) + ({632E1BFD-0000-0000-0000-000000000000}).8 = ({8BB20F0A-0000-0000-0000-000000000000}) + ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) + ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) + ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) + ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) + ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000}) + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {83C87BE6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {83C87BE6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {83C87BE6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {83C87BE6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU + {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU + {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection EndGlobal diff --git a/OpenSim/OpenSim.csproj b/OpenSim/OpenSim.csproj index 8e0d2638e3..c5858c102c 100644 --- a/OpenSim/OpenSim.csproj +++ b/OpenSim/OpenSim.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {8B0B16BC-D9D0-4200-8FEF-6B12AA896EC1} + {438A9556-0000-0000-0000-000000000000} Debug AnyCPU @@ -82,25 +82,25 @@ OpenSim.Framework - {BD7866A4-04BA-47F0-905F-B2359118F5B2} + {8ACA2445-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {4B0A7290-36C2-4C74-B9B4-07775B031CF2} + {A7CD0630-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Physics.Manager - {2EAB18A1-8187-4C79-9947-A671F9C007D9} + {8BE16150-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.RegionServer - {ADD974E2-994C-4998-864E-4B54D8AD5F00} + {632E1BFD-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln index 6dcce98ec1..227677f007 100644 --- a/Prebuild/Prebuild.sln +++ b/Prebuild/Prebuild.sln @@ -1,19 +1,19 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{92E80C1C-0000-0000-0000-000000000000}" EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection + 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 + EndGlobalSection EndGlobal diff --git a/Prebuild/src/Core/Nodes/ProjectNode.cs b/Prebuild/src/Core/Nodes/ProjectNode.cs index 7ac0a369b0..84d9f5db3d 100644 --- a/Prebuild/src/Core/Nodes/ProjectNode.cs +++ b/Prebuild/src/Core/Nodes/ProjectNode.cs @@ -424,7 +424,11 @@ namespace Prebuild.Core.Nodes m_Runtime = (ClrRuntime)Helper.EnumAttributeValue(node, "runtime", typeof(ClrRuntime), m_Runtime); m_StartupObject = Helper.AttributeValue(node, "startupObject", m_StartupObject); m_RootNamespace = Helper.AttributeValue(node, "rootNamespace", m_RootNamespace); - m_Guid = Guid.NewGuid(); + + int hash = m_Name.GetHashCode(); + + m_Guid = new Guid( hash, 0, 0, 0, 0, 0, 0,0,0,0,0 ); + m_GenerateAssemblyInfoFile = Helper.ParseBoolean(node, "generateAssemblyInfoFile", false); if(m_AssemblyName == null || m_AssemblyName.Length < 1) diff --git a/Prebuild/src/Core/Targets/VS2005Target.cs b/Prebuild/src/Core/Targets/VS2005Target.cs index 6435593deb..23b6116713 100644 --- a/Prebuild/src/Core/Targets/VS2005Target.cs +++ b/Prebuild/src/Core/Targets/VS2005Target.cs @@ -665,7 +665,7 @@ namespace Prebuild.Core.Targets if (projectFile.Contains( "OpenSim.csproj" )) { - ps.WriteLine(" -loginserver -sandbox -accounts -realphysx"); + ps.WriteLine(" -loginserver -sandbox -accounts"); } ps.WriteLine(" {0}", MakeRefPath(project)); diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj index 34daca99f4..55efffac57 100644 --- a/Prebuild/src/Prebuild.csproj +++ b/Prebuild/src/Prebuild.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {1C3A6B91-4AE9-440A-B0E0-E847681BF6D0} + {92E80C1C-0000-0000-0000-000000000000} Debug AnyCPU App.ico diff --git a/Servers/OpenSim.Servers.csproj b/Servers/OpenSim.Servers.csproj index 9710f4710b..d85c029691 100644 --- a/Servers/OpenSim.Servers.csproj +++ b/Servers/OpenSim.Servers.csproj @@ -1,13 +1,12 @@ - + Local 8.0.50727 2.0 - {B9D6A5F0-3BD2-4161-8AF1-90C03295D4EE} + {8BB20F0A-0000-0000-0000-000000000000} Debug AnyCPU - - + OpenSim.Servers @@ -16,11 +15,9 @@ IE50 false Library - - + OpenSim.Servers - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,19 +55,18 @@ False False 4 - - + - + System.dll False - + System.Xml.dll False - + ..\bin\libsecondlife.dll False @@ -81,23 +74,27 @@ OpenSim.Framework - {BD7866A4-04BA-47F0-905F-B2359118F5B2} + {8ACA2445-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.Framework.Console - {4B0A7290-36C2-4C74-B9B4-07775B031CF2} + {A7CD0630-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False Code - - + + Code + + + Code + @@ -106,4 +103,4 @@ - \ No newline at end of file + diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe index 4d798b36e48475a8a5b59ee94f2aa5750f5eea56..4717d79e6dd6ebc9e289571b89edc71a1f276caa 100644 GIT binary patch delta 21188 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 Jt0c+z{{Tx