From 81f01a12960a5004cde8321794c002e1ad9522b3 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Tue, 27 Mar 2007 20:19:35 +0000 Subject: * vaseline + duct-tape. --- .../OpenGridServices.GridServer.csproj | 2 +- .../OpenGridServices.UserServer.csproj | 2 +- .../OpenSim.Config.SimConfigDb4o.csproj | 114 ++++++++++++ .../OpenSim.Config.SimConfigDb4o.dll.build | 4 +- .../OpenSim.Framework.Console.csproj | 2 +- OpenSim.Framework/OpenSim.Framework.csproj | 2 +- .../Local/OpenSim.GridInterfaces.Local.csproj | 6 +- .../Local/OpenSim.GridInterfaces.Local.dll.build | 4 +- .../Remote/OpenSim.GridInterfaces.Remote.csproj | 6 +- .../Remote/OpenSim.GridInterfaces.Remote.dll.build | 4 +- .../OpenSim.Physics.BasicPhysicsPlugin.csproj | 4 +- .../Manager/OpenSim.Physics.Manager.csproj | 10 +- .../Manager/OpenSim.Physics.Manager.dll.build | 4 +- .../OdePlugin/OpenSim.Physics.OdePlugin.csproj | 4 +- .../PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj | 4 +- OpenSim.RegionServer/OpenSim.RegionServer.csproj | 10 +- .../OpenSim.RegionServer.dll.build | 2 +- .../OpenSim.Storage.LocalStorageDb4o.csproj | 6 +- .../OpenSim.Storage.LocalStorageDb4o.dll.build | 4 +- OpenSim.sln | 191 ++++++++++++--------- OpenSim/OpenSim.csproj | 10 +- OpenSim/OpenSim.exe.build | 2 +- Prebuild/Prebuild.sln | 28 +-- Prebuild/src/Core/Targets/NAntTarget.cs | 23 ++- Prebuild/src/Prebuild.csproj | 19 +- Servers/OpenSim.Servers.csproj | 2 +- bin/Prebuild.exe | Bin 176128 -> 176128 bytes prebuild.xml | 8 +- 28 files changed, 311 insertions(+), 166 deletions(-) diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj index 3621d49..de6813b 100644 --- a/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj +++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {95FF78AE-0745-4053-8FEF-AFC583C832D2} + {01238835-AEF2-4FC4-BE82-0992851EB4A9} Debug AnyCPU diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj index 725eb34..8334e436 100644 --- a/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj +++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {088BEE36-0600-4B7E-A273-DA184F50FBF0} + {F01B3935-7479-4EA1-8A91-DF554B7A9983} Debug AnyCPU diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj index e69de29..2cc54d3 100644 --- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj +++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj @@ -0,0 +1,114 @@ + + + Local + 8.0.50727 + 2.0 + {87E227FC-786C-4051-A75D-7FA75E3ADA1F} + Debug + AnyCPU + + + + OpenSim.Config.SimConfigDb4o + JScript + Grid + IE50 + false + Library + + OpenSim.Config.SimConfigDb4o + + + + + + False + 285212672 + False + + + TRACE;DEBUG + + True + 4096 + False + ..\..\bin\ + False + False + False + 4 + + + + False + 285212672 + False + + + TRACE + + False + 4096 + True + ..\..\bin\ + False + False + False + 4 + + + + + System.dll + False + + + ..\..\bin\System.Data.dll + False + + + System.Xml.dll + False + + + ..\..\bin\libsecondlife.dll + False + + + ..\..\bin\Db4objects.Db4o.dll + False + + + + + OpenSim.Framework + {E1171263-9131-454C-B0A6-2374D98714A8} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + + + OpenSim.Framework.Console + {C73A2D5E-EF8F-41D1-9A1D-1730694B6822} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + + + + + Code + + + Code + + + Code + + + + + + + + + + diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build index 20344d6..e576728 100644 --- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build +++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build @@ -25,8 +25,8 @@ - - + + diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj index 80e6f19..2171a45 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 - {9D66924D-0CA1-42DF-8055-832067B6BB7C} + {C73A2D5E-EF8F-41D1-9A1D-1730694B6822} Debug AnyCPU diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj index 61985da..d38d254 100644 --- a/OpenSim.Framework/OpenSim.Framework.csproj +++ b/OpenSim.Framework/OpenSim.Framework.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {1817C154-9111-4C45-A19A-609A5717C1FA} + {E1171263-9131-454C-B0A6-2374D98714A8} Debug AnyCPU diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj index 320b612..43914e0 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 - {7F7E640E-6574-4C72-B4BF-0B638669B2D1} + {12107D41-F2F9-4D49-835E-89D79D12DA8D} Debug AnyCPU @@ -78,13 +78,13 @@ OpenSim.Framework - {1817C154-9111-4C45-A19A-609A5717C1FA} + {E1171263-9131-454C-B0A6-2374D98714A8} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {023EA61E-BBAE-4FCC-BCDD-43A50FD95D54} + {C73A2D5E-EF8F-41D1-9A1D-1730694B6822} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build index bfc2988..6bf398e 100644 --- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build +++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build @@ -24,8 +24,8 @@ - - + + diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj index 484809c..0b59956 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 - {FC53257C-0CF2-4E12-9AA9-D3E74EE0928F} + {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B} Debug AnyCPU @@ -74,13 +74,13 @@ OpenSim.Framework - {1817C154-9111-4C45-A19A-609A5717C1FA} + {E1171263-9131-454C-B0A6-2374D98714A8} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {023EA61E-BBAE-4FCC-BCDD-43A50FD95D54} + {C73A2D5E-EF8F-41D1-9A1D-1730694B6822} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build index dfcf359..dd6db18 100644 --- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build +++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build @@ -23,8 +23,8 @@ - - + + diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj index d576eed..79a4126 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 - {D1C3CCC2-FE8C-4D78-966D-94A9493B174C} + {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808} Debug AnyCPU @@ -70,7 +70,7 @@ OpenSim.Physics.Manager - {D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C} + {EE1CA661-C388-44B7-BBE4-7C59C83B1E09} {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 db45286..6982715 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 - {D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C} + {EE1CA661-C388-44B7-BBE4-7C59C83B1E09} Debug AnyCPU @@ -72,9 +72,15 @@ + + OpenSim.Framework + {E1171263-9131-454C-B0A6-2374D98714A8} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + False + OpenSim.Framework.Console - {023EA61E-BBAE-4FCC-BCDD-43A50FD95D54} + {C73A2D5E-EF8F-41D1-9A1D-1730694B6822} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build index 88be1e5..4b5ee51 100644 --- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build +++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build @@ -25,8 +25,8 @@ - - + + diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj index 43829ca..2d39cf6 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 - {CDAFDD0E-89FE-4DC4-85A8-401E47E6AABA} + {4A7265F1-134B-4895-A33C-E9A3F84C6C08} Debug AnyCPU @@ -74,7 +74,7 @@ OpenSim.Physics.Manager - {D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C} + {EE1CA661-C388-44B7-BBE4-7C59C83B1E09} {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 af67648..347d9b2 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 - {1B7578FB-958F-4889-B147-8221CDFC6C4E} + {70E89693-4AEF-4EA1-8306-D0EBED065AC8} Debug AnyCPU @@ -74,7 +74,7 @@ OpenSim.Physics.Manager - {D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C} + {EE1CA661-C388-44B7-BBE4-7C59C83B1E09} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 086e287..c08eb48 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {D385B640-E037-419A-AC83-5CB6E66D9FF3} + {72B438C6-38C5-4620-AC4C-E15BA326FF51} Debug AnyCPU @@ -82,25 +82,25 @@ OpenSim.Framework - {1817C154-9111-4C45-A19A-609A5717C1FA} + {E1171263-9131-454C-B0A6-2374D98714A8} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {023EA61E-BBAE-4FCC-BCDD-43A50FD95D54} + {C73A2D5E-EF8F-41D1-9A1D-1730694B6822} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Physics.Manager - {D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C} + {EE1CA661-C388-44B7-BBE4-7C59C83B1E09} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Servers - {570A9C4C-950E-4F9D-9FB1-1A77E1A5C4C2} + {8038EFDC-3245-4EA1-B198-0DA1E724D7A1} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index 78e0e8d..04e86bc 100644 --- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build @@ -51,7 +51,7 @@ - + diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj index 74ba38e..035931e 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 - {CC3316C2-0D2C-47DC-9BDD-C2D84BB2D36B} + {FC8E9647-4292-49BC-810F-EAEEBF82396B} Debug AnyCPU @@ -78,13 +78,13 @@ OpenSim.Framework - {1817C154-9111-4C45-A19A-609A5717C1FA} + {E1171263-9131-454C-B0A6-2374D98714A8} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {023EA61E-BBAE-4FCC-BCDD-43A50FD95D54} + {C73A2D5E-EF8F-41D1-9A1D-1730694B6822} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build index b80bf58..550eaa5 100644 --- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build @@ -24,8 +24,8 @@ - - + + diff --git a/OpenSim.sln b/OpenSim.sln index d030e31..c041637 100644 --- a/OpenSim.sln +++ b/OpenSim.sln @@ -1,103 +1,126 @@ Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "Servers\OpenSim.Servers.csproj", "{570A9C4C-950E-4F9D-9FB1-1A77E1A5C4C2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Servers", "Servers\OpenSim.Servers.csproj", "{8038EFDC-3245-4EA1-B198-0DA1E724D7A1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{023EA61E-BBAE-4FCC-BCDD-43A50FD95D54}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{C73A2D5E-EF8F-41D1-9A1D-1730694B6822}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{BF988EF6-D598-4B1B-914E-269BCF7CDF5E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{87E227FC-786C-4051-A75D-7FA75E3ADA1F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{088BEE36-0600-4B7E-A273-DA184F50FBF0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.UserServer", "OpenGridServices.UserServer\OpenGridServices.UserServer.csproj", "{F01B3935-7479-4EA1-8A91-DF554B7A9983}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{FC53257C-0CF2-4E12-9AA9-D3E74EE0928F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{CC3316C2-0D2C-47DC-9BDD-C2D84BB2D36B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{FC8E9647-4292-49BC-810F-EAEEBF82396B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{1817C154-9111-4C45-A19A-609A5717C1FA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{E1171263-9131-454C-B0A6-2374D98714A8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{95FF78AE-0745-4053-8FEF-AFC583C832D2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{01238835-AEF2-4FC4-BE82-0992851EB4A9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{CDAFDD0E-89FE-4DC4-85A8-401E47E6AABA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{4A7265F1-134B-4895-A33C-E9A3F84C6C08}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{D1C3CCC2-FE8C-4D78-966D-94A9493B174C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{631F3710-2C88-4AD4-AA6E-FB06BC909769}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{974744D2-C043-42F8-BEE0-DABFD4A294E9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{D385B640-E037-419A-AC83-5CB6E66D9FF3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{72B438C6-38C5-4620-AC4C-E15BA326FF51}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{EE1CA661-C388-44B7-BBE4-7C59C83B1E09}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{7F7E640E-6574-4C72-B4BF-0B638669B2D1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{12107D41-F2F9-4D49-835E-89D79D12DA8D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{1B7578FB-958F-4889-B147-8221CDFC6C4E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{70E89693-4AEF-4EA1-8306-D0EBED065AC8}" EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {570A9C4C-950E-4F9D-9FB1-1A77E1A5C4C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {570A9C4C-950E-4F9D-9FB1-1A77E1A5C4C2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {570A9C4C-950E-4F9D-9FB1-1A77E1A5C4C2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {570A9C4C-950E-4F9D-9FB1-1A77E1A5C4C2}.Release|Any CPU.Build.0 = Release|Any CPU - {023EA61E-BBAE-4FCC-BCDD-43A50FD95D54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {023EA61E-BBAE-4FCC-BCDD-43A50FD95D54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {023EA61E-BBAE-4FCC-BCDD-43A50FD95D54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {023EA61E-BBAE-4FCC-BCDD-43A50FD95D54}.Release|Any CPU.Build.0 = Release|Any CPU - {BF988EF6-D598-4B1B-914E-269BCF7CDF5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF988EF6-D598-4B1B-914E-269BCF7CDF5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF988EF6-D598-4B1B-914E-269BCF7CDF5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF988EF6-D598-4B1B-914E-269BCF7CDF5E}.Release|Any CPU.Build.0 = Release|Any CPU - {088BEE36-0600-4B7E-A273-DA184F50FBF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {088BEE36-0600-4B7E-A273-DA184F50FBF0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {088BEE36-0600-4B7E-A273-DA184F50FBF0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {088BEE36-0600-4B7E-A273-DA184F50FBF0}.Release|Any CPU.Build.0 = Release|Any CPU - {FC53257C-0CF2-4E12-9AA9-D3E74EE0928F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC53257C-0CF2-4E12-9AA9-D3E74EE0928F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC53257C-0CF2-4E12-9AA9-D3E74EE0928F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC53257C-0CF2-4E12-9AA9-D3E74EE0928F}.Release|Any CPU.Build.0 = Release|Any CPU - {CC3316C2-0D2C-47DC-9BDD-C2D84BB2D36B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC3316C2-0D2C-47DC-9BDD-C2D84BB2D36B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC3316C2-0D2C-47DC-9BDD-C2D84BB2D36B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC3316C2-0D2C-47DC-9BDD-C2D84BB2D36B}.Release|Any CPU.Build.0 = Release|Any CPU - {1817C154-9111-4C45-A19A-609A5717C1FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1817C154-9111-4C45-A19A-609A5717C1FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1817C154-9111-4C45-A19A-609A5717C1FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1817C154-9111-4C45-A19A-609A5717C1FA}.Release|Any CPU.Build.0 = Release|Any CPU - {95FF78AE-0745-4053-8FEF-AFC583C832D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95FF78AE-0745-4053-8FEF-AFC583C832D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95FF78AE-0745-4053-8FEF-AFC583C832D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95FF78AE-0745-4053-8FEF-AFC583C832D2}.Release|Any CPU.Build.0 = Release|Any CPU - {CDAFDD0E-89FE-4DC4-85A8-401E47E6AABA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CDAFDD0E-89FE-4DC4-85A8-401E47E6AABA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CDAFDD0E-89FE-4DC4-85A8-401E47E6AABA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CDAFDD0E-89FE-4DC4-85A8-401E47E6AABA}.Release|Any CPU.Build.0 = Release|Any CPU - {D1C3CCC2-FE8C-4D78-966D-94A9493B174C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1C3CCC2-FE8C-4D78-966D-94A9493B174C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1C3CCC2-FE8C-4D78-966D-94A9493B174C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1C3CCC2-FE8C-4D78-966D-94A9493B174C}.Release|Any CPU.Build.0 = Release|Any CPU - {631F3710-2C88-4AD4-AA6E-FB06BC909769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {631F3710-2C88-4AD4-AA6E-FB06BC909769}.Debug|Any CPU.Build.0 = Debug|Any CPU - {631F3710-2C88-4AD4-AA6E-FB06BC909769}.Release|Any CPU.ActiveCfg = Release|Any CPU - {631F3710-2C88-4AD4-AA6E-FB06BC909769}.Release|Any CPU.Build.0 = Release|Any CPU - {D385B640-E037-419A-AC83-5CB6E66D9FF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D385B640-E037-419A-AC83-5CB6E66D9FF3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D385B640-E037-419A-AC83-5CB6E66D9FF3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D385B640-E037-419A-AC83-5CB6E66D9FF3}.Release|Any CPU.Build.0 = Release|Any CPU - {D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C}.Release|Any CPU.Build.0 = Release|Any CPU - {7F7E640E-6574-4C72-B4BF-0B638669B2D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7F7E640E-6574-4C72-B4BF-0B638669B2D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7F7E640E-6574-4C72-B4BF-0B638669B2D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7F7E640E-6574-4C72-B4BF-0B638669B2D1}.Release|Any CPU.Build.0 = Release|Any CPU - {1B7578FB-958F-4889-B147-8221CDFC6C4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1B7578FB-958F-4889-B147-8221CDFC6C4E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B7578FB-958F-4889-B147-8221CDFC6C4E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1B7578FB-958F-4889-B147-8221CDFC6C4E}.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 + ({87E227FC-786C-4051-A75D-7FA75E3ADA1F}).5 = ({E1171263-9131-454C-B0A6-2374D98714A8}) + ({87E227FC-786C-4051-A75D-7FA75E3ADA1F}).6 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822}) + ({FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}).3 = ({E1171263-9131-454C-B0A6-2374D98714A8}) + ({FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}).4 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822}) + ({FC8E9647-4292-49BC-810F-EAEEBF82396B}).4 = ({E1171263-9131-454C-B0A6-2374D98714A8}) + ({FC8E9647-4292-49BC-810F-EAEEBF82396B}).5 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822}) + ({4A7265F1-134B-4895-A33C-E9A3F84C6C08}).2 = ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09}) + ({E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}).2 = ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09}) + ({974744D2-C043-42F8-BEE0-DABFD4A294E9}).5 = ({E1171263-9131-454C-B0A6-2374D98714A8}) + ({974744D2-C043-42F8-BEE0-DABFD4A294E9}).6 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822}) + ({974744D2-C043-42F8-BEE0-DABFD4A294E9}).7 = ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09}) + ({974744D2-C043-42F8-BEE0-DABFD4A294E9}).8 = ({72B438C6-38C5-4620-AC4C-E15BA326FF51}) + ({72B438C6-38C5-4620-AC4C-E15BA326FF51}).5 = ({E1171263-9131-454C-B0A6-2374D98714A8}) + ({72B438C6-38C5-4620-AC4C-E15BA326FF51}).6 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822}) + ({72B438C6-38C5-4620-AC4C-E15BA326FF51}).7 = ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09}) + ({72B438C6-38C5-4620-AC4C-E15BA326FF51}).8 = ({8038EFDC-3245-4EA1-B198-0DA1E724D7A1}) + ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09}).3 = ({E1171263-9131-454C-B0A6-2374D98714A8}) + ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09}).4 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822}) + ({12107D41-F2F9-4D49-835E-89D79D12DA8D}).4 = ({E1171263-9131-454C-B0A6-2374D98714A8}) + ({12107D41-F2F9-4D49-835E-89D79D12DA8D}).5 = ({C73A2D5E-EF8F-41D1-9A1D-1730694B6822}) + ({70E89693-4AEF-4EA1-8306-D0EBED065AC8}).3 = ({EE1CA661-C388-44B7-BBE4-7C59C83B1E09}) + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8038EFDC-3245-4EA1-B198-0DA1E724D7A1}.Release|Any CPU.Build.0 = Release|Any CPU + {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C73A2D5E-EF8F-41D1-9A1D-1730694B6822}.Release|Any CPU.Build.0 = Release|Any CPU + {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {87E227FC-786C-4051-A75D-7FA75E3ADA1F}.Release|Any CPU.Build.0 = Release|Any CPU + {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F01B3935-7479-4EA1-8A91-DF554B7A9983}.Release|Any CPU.Build.0 = Release|Any CPU + {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FE805D98-EE6A-48FD-8B9A-8DF17FA4351B}.Release|Any CPU.Build.0 = Release|Any CPU + {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FC8E9647-4292-49BC-810F-EAEEBF82396B}.Release|Any CPU.Build.0 = Release|Any CPU + {E1171263-9131-454C-B0A6-2374D98714A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1171263-9131-454C-B0A6-2374D98714A8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1171263-9131-454C-B0A6-2374D98714A8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1171263-9131-454C-B0A6-2374D98714A8}.Release|Any CPU.Build.0 = Release|Any CPU + {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {01238835-AEF2-4FC4-BE82-0992851EB4A9}.Release|Any CPU.Build.0 = Release|Any CPU + {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4A7265F1-134B-4895-A33C-E9A3F84C6C08}.Release|Any CPU.Build.0 = Release|Any CPU + {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E12D07F3-9B03-47E7-B0D6-A1FA9ECE3808}.Release|Any CPU.Build.0 = Release|Any CPU + {974744D2-C043-42F8-BEE0-DABFD4A294E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {974744D2-C043-42F8-BEE0-DABFD4A294E9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {974744D2-C043-42F8-BEE0-DABFD4A294E9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {974744D2-C043-42F8-BEE0-DABFD4A294E9}.Release|Any CPU.Build.0 = Release|Any CPU + {72B438C6-38C5-4620-AC4C-E15BA326FF51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {72B438C6-38C5-4620-AC4C-E15BA326FF51}.Debug|Any CPU.Build.0 = Debug|Any CPU + {72B438C6-38C5-4620-AC4C-E15BA326FF51}.Release|Any CPU.ActiveCfg = Release|Any CPU + {72B438C6-38C5-4620-AC4C-E15BA326FF51}.Release|Any CPU.Build.0 = Release|Any CPU + {EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EE1CA661-C388-44B7-BBE4-7C59C83B1E09}.Release|Any CPU.Build.0 = Release|Any CPU + {12107D41-F2F9-4D49-835E-89D79D12DA8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {12107D41-F2F9-4D49-835E-89D79D12DA8D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {12107D41-F2F9-4D49-835E-89D79D12DA8D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {12107D41-F2F9-4D49-835E-89D79D12DA8D}.Release|Any CPU.Build.0 = Release|Any CPU + {70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {70E89693-4AEF-4EA1-8306-D0EBED065AC8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {70E89693-4AEF-4EA1-8306-D0EBED065AC8}.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 8b1be6a..0598f83 100644 --- a/OpenSim/OpenSim.csproj +++ b/OpenSim/OpenSim.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {631F3710-2C88-4AD4-AA6E-FB06BC909769} + {974744D2-C043-42F8-BEE0-DABFD4A294E9} Debug AnyCPU @@ -82,25 +82,25 @@ OpenSim.Framework - {1817C154-9111-4C45-A19A-609A5717C1FA} + {E1171263-9131-454C-B0A6-2374D98714A8} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Framework.Console - {023EA61E-BBAE-4FCC-BCDD-43A50FD95D54} + {C73A2D5E-EF8F-41D1-9A1D-1730694B6822} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.Physics.Manager - {D9A7F5B1-0F86-4463-BA4C-9F15D3981E5C} + {EE1CA661-C388-44B7-BBE4-7C59C83B1E09} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False OpenSim.RegionServer - {D385B640-E037-419A-AC83-5CB6E66D9FF3} + {72B438C6-38C5-4620-AC4C-E15BA326FF51} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} False diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build index 09e29ee..613f527 100644 --- a/OpenSim/OpenSim.exe.build +++ b/OpenSim/OpenSim.exe.build @@ -25,7 +25,7 @@ - + diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln index b36ed1e..0f35f18 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", "{6A56621D-A328-4E23-96E3-0514A3817BAF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}" EndProject Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6A56621D-A328-4E23-96E3-0514A3817BAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A56621D-A328-4E23-96E3-0514A3817BAF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A56621D-A328-4E23-96E3-0514A3817BAF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A56621D-A328-4E23-96E3-0514A3817BAF}.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 + {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {90DC3E1A-3A71-47DA-A7BE-CDA0C9828E1D}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection EndGlobal diff --git a/Prebuild/src/Core/Targets/NAntTarget.cs b/Prebuild/src/Core/Targets/NAntTarget.cs index 242bb9c..0f0deb2 100644 --- a/Prebuild/src/Core/Targets/NAntTarget.cs +++ b/Prebuild/src/Core/Targets/NAntTarget.cs @@ -77,14 +77,14 @@ namespace Prebuild.Core.Targets return tmpPath; } - private static string BuildReference(SolutionNode solution, ReferenceNode refr) + private static string BuildReference(SolutionNode solution, ProjectNode currentProject, ReferenceNode refr) { string ret = ""; if(solution.ProjectsTable.ContainsKey(refr.Name)) { - ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name]; - - string finalPath = Helper.NormalizePath( ((ReferencePathNode) project.ReferencePaths[0]).Path + refr.Name + ".dll", '/'); + ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name]; + + string finalPath = Helper.NormalizePath(((ReferencePathNode)currentProject.ReferencePaths[0]).Path + refr.Name + ".dll", '/'); return finalPath; } @@ -126,12 +126,11 @@ namespace Prebuild.Core.Targets string ret = ""; if(solution.ProjectsTable.ContainsKey(refr.Name)) { - ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name]; - string fileRef = FindFileReference(refr.Name, project); - string finalPath = Helper.NormalizePath(Helper.MakeReferencePath(project.FullPath + "/${build.dir}/"), '/'); - ret += finalPath; - return ret; - } + ProjectNode project = (ProjectNode)solution.ProjectsTable[refr.Name]; + string finalPath = Helper.NormalizePath(((ReferencePathNode)project.ReferencePaths[0]).Path, '/'); + + return finalPath; + } else { ProjectNode project = (ProjectNode)refr.Parent; @@ -226,7 +225,7 @@ namespace Prebuild.Core.Targets { if (refr.LocalCopy) { - ss.WriteLine(" ", '/')); + ss.WriteLine(" ", '/')); } } ss.WriteLine(" "); @@ -316,7 +315,7 @@ namespace Prebuild.Core.Targets ss.WriteLine(" "); foreach(ReferenceNode refr in project.References) { - string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, refr)), '/'); + string path = Helper.NormalizePath(Helper.MakePathRelativeTo(project.FullPath, BuildReference(solution, project, refr)), '/'); ss.WriteLine(" " ); } ss.WriteLine(" "); diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj index c1ab9b2..3727947 100644 --- a/Prebuild/src/Prebuild.csproj +++ b/Prebuild/src/Prebuild.csproj @@ -1,4 +1,4 @@ - + Local 8.0.50727 @@ -17,7 +17,8 @@ IE50 false Exe - + + Prebuild Prebuild.Prebuild @@ -30,7 +31,8 @@ DEBUG;TRACE - + + True 4096 False @@ -48,7 +50,8 @@ TRACE - + + False 4096 True @@ -60,15 +63,15 @@ 1595 - + System.EnterpriseServices.dll False - + System.Xml.dll False - + System.dll False @@ -202,4 +205,4 @@ - + \ No newline at end of file diff --git a/Servers/OpenSim.Servers.csproj b/Servers/OpenSim.Servers.csproj index 713ef6a..0059bb3 100644 --- a/Servers/OpenSim.Servers.csproj +++ b/Servers/OpenSim.Servers.csproj @@ -3,7 +3,7 @@ Local 8.0.50727 2.0 - {BDB404AB-194D-4D2F-B42C-9E0C02E9553E} + {8038EFDC-3245-4EA1-B198-0DA1E724D7A1} Debug AnyCPU diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe index 7b080bc..4d798b3 100644 Binary files a/bin/Prebuild.exe and b/bin/Prebuild.exe differ diff --git a/prebuild.xml b/prebuild.xml index 7c08008..3c84703 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -110,8 +110,8 @@ ../bin/ - - + + @@ -138,7 +138,7 @@ - + @@ -163,7 +163,7 @@ - + -- cgit v1.1