aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712007-03-24 08:06:41 +0000
committerlbsa712007-03-24 08:06:41 +0000
commit50f5686d918dbd519f21c0c611bea3f28daf4657 (patch)
tree769f71b6f5854b524fd5895fc05718da6a1991da
parentAdded Fly animation (diff)
downloadopensim-SC_OLD-50f5686d918dbd519f21c0c611bea3f28daf4657.zip
opensim-SC_OLD-50f5686d918dbd519f21c0c611bea3f28daf4657.tar.gz
opensim-SC_OLD-50f5686d918dbd519f21c0c611bea3f28daf4657.tar.bz2
opensim-SC_OLD-50f5686d918dbd519f21c0c611bea3f28daf4657.tar.xz
* Added separate exe project
* Prebuild exe is now built in /bin dir
Diffstat (limited to '')
-rw-r--r--OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj6
-rw-r--r--OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build2
-rw-r--r--OpenSim.Framework.Console/OpenSim.Framework.Console.csproj2
-rw-r--r--OpenSim.Framework/OpenSim.Framework.csproj2
-rw-r--r--OpenSim.Framework/OpenSim.Framework.dll.build4
-rw-r--r--OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj6
-rw-r--r--OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build2
-rw-r--r--OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj6
-rw-r--r--OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build2
-rw-r--r--OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj4
-rw-r--r--OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj4
-rw-r--r--OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build2
-rw-r--r--OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj4
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.csproj66
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.dll.build68
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs72
-rw-r--r--OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj6
-rw-r--r--OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build2
-rw-r--r--OpenSim.build9
-rw-r--r--OpenSim.sln144
-rw-r--r--OpenSim/OpenSim.csproj120
-rw-r--r--OpenSim/OpenSim.exe.build47
-rw-r--r--OpenSim/RegionServer.cs75
-rw-r--r--Prebuild/Prebuild.sln30
-rw-r--r--Prebuild/src/Prebuild.csproj38
-rw-r--r--Prebuild/src/Prebuild.exe.build6
-rw-r--r--README.txt5
-rw-r--r--prebuild.xml41
28 files changed, 544 insertions, 231 deletions
diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
index ddb5415..cf13d5b 100644
--- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
+++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{ED9A6AEE-92B9-45E1-9834-4D6DDBBBAEA0}</ProjectGuid> 6 <ProjectGuid>{C77FAE85-A786-4DEB-9AEB-46B75169079C}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
@@ -82,13 +82,13 @@
82 <ItemGroup> 82 <ItemGroup>
83 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> 83 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
84 <Name>OpenSim.Framework</Name> 84 <Name>OpenSim.Framework</Name>
85 <Project>{E267CE4E-F355-4A27-8D0D-CA48FEE7F978}</Project> 85 <Project>{71848571-2BC0-41DC-A69C-28B6DDB8C8CE}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private> 87 <Private>False</Private>
88 </ProjectReference> 88 </ProjectReference>
89 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 89 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
90 <Name>OpenSim.Framework.Console</Name> 90 <Name>OpenSim.Framework.Console</Name>
91 <Project>{1492353A-6133-4557-9AD8-6E24386D70F8}</Project> 91 <Project>{CE124F22-69FC-4499-AE68-1B877C5898C4}</Project>
92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
93 <Private>False</Private> 93 <Private>False</Private>
94 </ProjectReference> 94 </ProjectReference>
diff --git a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
index 288e877..3dfa7ce 100644
--- a/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
+++ b/OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build
@@ -22,7 +22,7 @@
22 </lib> 22 </lib>
23 <include name="System.dll" /> 23 <include name="System.dll" />
24 <include name="System.Data.dll.dll" /> 24 <include name="System.Data.dll.dll" />
25 <include name="System.Xml.dll.dll" /> 25 <include name="System.Xml.dll" />
26 <include name="../../bin/libsecondlife.dll" /> 26 <include name="../../bin/libsecondlife.dll" />
27 <include name="../../bin/Db4objects.Db4o.dll" /> 27 <include name="../../bin/Db4objects.Db4o.dll" />
28 <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> 28 <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
index 2679789..dee9a8c 100644
--- a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
+++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{1492353A-6133-4557-9AD8-6E24386D70F8}</ProjectGuid> 6 <ProjectGuid>{CE124F22-69FC-4499-AE68-1B877C5898C4}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj
index 7b805ef..745874c 100644
--- a/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/OpenSim.Framework/OpenSim.Framework.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{E267CE4E-F355-4A27-8D0D-CA48FEE7F978}</ProjectGuid> 6 <ProjectGuid>{71848571-2BC0-41DC-A69C-28B6DDB8C8CE}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build
index 1418947..4963892 100644
--- a/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -40,8 +40,8 @@
40 <include name="${project::get-base-directory()}" /> 40 <include name="${project::get-base-directory()}" />
41 <include name="${project::get-base-directory()}/${build.dir}" /> 41 <include name="${project::get-base-directory()}/${build.dir}" />
42 </lib> 42 </lib>
43 <include name="System.dll.dll" /> 43 <include name="System.dll" />
44 <include name="System.Xml.dll.dll" /> 44 <include name="System.Xml.dll" />
45 <include name="../bin/libsecondlife.dll" /> 45 <include name="../bin/libsecondlife.dll" />
46 </references> 46 </references>
47 </csc> 47 </csc>
diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
index 7a319c7..ebf950a 100644
--- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
+++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{9257C89E-0894-4CE5-B25D-3D6EA50F38D0}</ProjectGuid> 6 <ProjectGuid>{5A852B3E-E770-4B00-A34B-1F8B4ABDA570}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
@@ -78,13 +78,13 @@
78 <ItemGroup> 78 <ItemGroup>
79 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> 79 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
80 <Name>OpenSim.Framework</Name> 80 <Name>OpenSim.Framework</Name>
81 <Project>{E267CE4E-F355-4A27-8D0D-CA48FEE7F978}</Project> 81 <Project>{71848571-2BC0-41DC-A69C-28B6DDB8C8CE}</Project>
82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
83 <Private>False</Private> 83 <Private>False</Private>
84 </ProjectReference> 84 </ProjectReference>
85 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 85 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
86 <Name>OpenSim.Framework.Console</Name> 86 <Name>OpenSim.Framework.Console</Name>
87 <Project>{1492353A-6133-4557-9AD8-6E24386D70F8}</Project> 87 <Project>{CE124F22-69FC-4499-AE68-1B877C5898C4}</Project>
88 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 88 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
89 <Private>False</Private> 89 <Private>False</Private>
90 </ProjectReference> 90 </ProjectReference>
diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
index eff1fac..ec65ba8 100644
--- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
+++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
@@ -21,7 +21,7 @@
21 <include name="${project::get-base-directory()}/${build.dir}" /> 21 <include name="${project::get-base-directory()}/${build.dir}" />
22 </lib> 22 </lib>
23 <include name="System.dll" /> 23 <include name="System.dll" />
24 <include name="System.Xml.dll.dll" /> 24 <include name="System.Xml.dll" />
25 <include name="../../bin/Db4objects.Db4o.dll" /> 25 <include name="../../bin/Db4objects.Db4o.dll" />
26 <include name="../../bin/libsecondlife.dll" /> 26 <include name="../../bin/libsecondlife.dll" />
27 <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> 27 <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
index ae03440..1de7ae0 100644
--- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
+++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{B1BC5710-EA90-4566-A6A4-93D90EC19449}</ProjectGuid> 6 <ProjectGuid>{E0C662BD-1B64-4782-B8F2-9511255DB971}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
@@ -74,13 +74,13 @@
74 <ItemGroup> 74 <ItemGroup>
75 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> 75 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
76 <Name>OpenSim.Framework</Name> 76 <Name>OpenSim.Framework</Name>
77 <Project>{E267CE4E-F355-4A27-8D0D-CA48FEE7F978}</Project> 77 <Project>{71848571-2BC0-41DC-A69C-28B6DDB8C8CE}</Project>
78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
79 <Private>False</Private> 79 <Private>False</Private>
80 </ProjectReference> 80 </ProjectReference>
81 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 81 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
82 <Name>OpenSim.Framework.Console</Name> 82 <Name>OpenSim.Framework.Console</Name>
83 <Project>{1492353A-6133-4557-9AD8-6E24386D70F8}</Project> 83 <Project>{CE124F22-69FC-4499-AE68-1B877C5898C4}</Project>
84 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 84 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
85 <Private>False</Private> 85 <Private>False</Private>
86 </ProjectReference> 86 </ProjectReference>
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
index e0d24ff..2060454 100644
--- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
+++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
@@ -21,7 +21,7 @@
21 <include name="${project::get-base-directory()}/${build.dir}" /> 21 <include name="${project::get-base-directory()}/${build.dir}" />
22 </lib> 22 </lib>
23 <include name="System.dll" /> 23 <include name="System.dll" />
24 <include name="System.Xml.dll.dll" /> 24 <include name="System.Xml.dll" />
25 <include name="../../bin/libsecondlife.dll" /> 25 <include name="../../bin/libsecondlife.dll" />
26 <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> 26 <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
27 <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> 27 <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
index 996ed5f..608c0a7 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
+++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{B045B311-34DF-4643-9C06-10E5BCF1B227}</ProjectGuid> 6 <ProjectGuid>{0A4D5E28-88B6-474E-AC5F-3F99822DD976}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
@@ -70,7 +70,7 @@
70 <ItemGroup> 70 <ItemGroup>
71 <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> 71 <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
72 <Name>OpenSim.Physics.Manager</Name> 72 <Name>OpenSim.Physics.Manager</Name>
73 <Project>{0FD686EA-1917-469E-A885-1D9DEEA1D340}</Project> 73 <Project>{79C8C9A7-EF80-426D-B815-AC88E7998DFE}</Project>
74 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 74 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
75 <Private>False</Private> 75 <Private>False</Private>
76 </ProjectReference> 76 </ProjectReference>
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
index 56e09e9..3a7925c 100644
--- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
+++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{0FD686EA-1917-469E-A885-1D9DEEA1D340}</ProjectGuid> 6 <ProjectGuid>{79C8C9A7-EF80-426D-B815-AC88E7998DFE}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
@@ -74,7 +74,7 @@
74 <ItemGroup> 74 <ItemGroup>
75 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 75 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
76 <Name>OpenSim.Framework.Console</Name> 76 <Name>OpenSim.Framework.Console</Name>
77 <Project>{1492353A-6133-4557-9AD8-6E24386D70F8}</Project> 77 <Project>{CE124F22-69FC-4499-AE68-1B877C5898C4}</Project>
78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
79 <Private>False</Private> 79 <Private>False</Private>
80 </ProjectReference> 80 </ProjectReference>
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
index 0f6565b..47e5534 100644
--- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
+++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
@@ -23,7 +23,7 @@
23 <include name="${project::get-base-directory()}/${build.dir}" /> 23 <include name="${project::get-base-directory()}/${build.dir}" />
24 </lib> 24 </lib>
25 <include name="System.dll" /> 25 <include name="System.dll" />
26 <include name="System.Xml.dll.dll" /> 26 <include name="System.Xml.dll" />
27 <include name="../../bin/Axiom.MathLib.dll" /> 27 <include name="../../bin/Axiom.MathLib.dll" />
28 <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" /> 28 <include name="../../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
29 </references> 29 </references>
diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
index 95dff0b..463700e 100644
--- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
+++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{401245BB-2D4A-47D2-B377-179F62277E3E}</ProjectGuid> 6 <ProjectGuid>{62652FE9-20CC-4855-9D1C-6C1CCD706CC1}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
@@ -74,7 +74,7 @@
74 <ItemGroup> 74 <ItemGroup>
75 <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj"> 75 <ProjectReference Include="..\Manager\OpenSim.Physics.Manager.csproj">
76 <Name>OpenSim.Physics.Manager</Name> 76 <Name>OpenSim.Physics.Manager</Name>
77 <Project>{0FD686EA-1917-469E-A885-1D9DEEA1D340}</Project> 77 <Project>{79C8C9A7-EF80-426D-B815-AC88E7998DFE}</Project>
78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
79 <Private>False</Private> 79 <Private>False</Private>
80 </ProjectReference> 80 </ProjectReference>
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 8129741..b191922 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -1,24 +1,23 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{50D8594C-39E2-4695-B28D-AC8ADE15BC5A}</ProjectGuid> 6 <ProjectGuid>{457CE564-0922-4F15-846F-147E5BE62D67}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
13 <AssemblyName>OpenSim</AssemblyName> 12 <AssemblyName>OpenSim.RegionServer</AssemblyName>
14 <DefaultClientScript>JScript</DefaultClientScript> 13 <DefaultClientScript>JScript</DefaultClientScript>
15 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> 14 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
16 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
18 <OutputType>Exe</OutputType> 17 <OutputType>Library</OutputType>
19 <AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenSim.RegionServer</RootNamespace> 19 <RootNamespace>OpenSim.RegionServer</RootNamespace>
20 <StartupObject></StartupObject>
22 <FileUpgradeFlags> 21 <FileUpgradeFlags>
23 </FileUpgradeFlags> 22 </FileUpgradeFlags>
24 </PropertyGroup> 23 </PropertyGroup>
@@ -29,8 +28,7 @@
29 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
30 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
31 <DefineConstants>TRACE;DEBUG</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
32 <DocumentationFile> 31 <DocumentationFile></DocumentationFile>
33 </DocumentationFile>
34 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
35 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
36 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
@@ -39,8 +37,7 @@
39 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
40 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
41 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
42 <NoWarn> 40 <NoWarn></NoWarn>
43 </NoWarn>
44 </PropertyGroup> 41 </PropertyGroup>
45 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
46 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -49,8 +46,7 @@
49 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
50 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
51 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
52 <DocumentationFile> 49 <DocumentationFile></DocumentationFile>
53 </DocumentationFile>
54 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
55 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
56 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
@@ -59,41 +55,48 @@
59 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
60 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
61 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
62 <NoWarn> 58 <NoWarn></NoWarn>
63 </NoWarn>
64 </PropertyGroup> 59 </PropertyGroup>
65 <ItemGroup> 60 <ItemGroup>
66 <Reference Include="System"> 61 <Reference Include="System" >
67 <HintPath>\System.dll</HintPath> 62 <HintPath>System.dll</HintPath>
63 <Private>False</Private>
68 </Reference> 64 </Reference>
69 <Reference Include="System.Xml.dll"> 65 <Reference Include="System.Xml" >
70 <HintPath>\System.Xml.dll.dll</HintPath> 66 <HintPath>System.Xml.dll</HintPath>
67 <Private>False</Private>
71 </Reference> 68 </Reference>
72 <Reference Include="libsecondlife.dll"> 69 <Reference Include="libsecondlife.dll" >
73 <HintPath>\libsecondlife.dll.dll</HintPath> 70 <HintPath>..\bin\libsecondlife.dll</HintPath>
71 <Private>False</Private>
74 </Reference> 72 </Reference>
75 <Reference Include="Axiom.MathLib.dll"> 73 <Reference Include="Axiom.MathLib.dll" >
76 <HintPath>\Axiom.MathLib.dll.dll</HintPath> 74 <HintPath>..\bin\Axiom.MathLib.dll</HintPath>
75 <Private>False</Private>
77 </Reference> 76 </Reference>
78 <Reference Include="Db4objects.Db4o.dll"> 77 <Reference Include="Db4objects.Db4o.dll" >
79 <HintPath>\Db4objects.Db4o.dll.dll</HintPath> 78 <HintPath>..\bin\Db4objects.Db4o.dll</HintPath>
79 <Private>False</Private>
80 </Reference> 80 </Reference>
81 </ItemGroup> 81 </ItemGroup>
82 <ItemGroup> 82 <ItemGroup>
83 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 83 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
84 <Name>OpenSim.Framework.Console</Name> 84 <Name>OpenSim.Framework.Console</Name>
85 <Project>{C8405E1A-EC19-48B6-9C8C-CA03624B9916}</Project> 85 <Project>{CE124F22-69FC-4499-AE68-1B877C5898C4}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private>
87 </ProjectReference> 88 </ProjectReference>
88 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> 89 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
89 <Name>OpenSim.Physics.Manager</Name> 90 <Name>OpenSim.Physics.Manager</Name>
90 <Project>{58360A80-9333-4E0F-8F83-3CF937E51633}</Project> 91 <Project>{79C8C9A7-EF80-426D-B815-AC88E7998DFE}</Project>
91 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
93 <Private>False</Private>
92 </ProjectReference> 94 </ProjectReference>
93 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> 95 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
94 <Name>OpenSim.Framework</Name> 96 <Name>OpenSim.Framework</Name>
95 <Project>{1D2865A9-CF8E-45F7-B96D-91ED128A32CF}</Project> 97 <Project>{71848571-2BC0-41DC-A69C-28B6DDB8C8CE}</Project>
96 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
99 <Private>False</Private>
97 </ProjectReference> 100 </ProjectReference>
98 </ItemGroup> 101 </ItemGroup>
99 <ItemGroup> 102 <ItemGroup>
@@ -145,6 +148,9 @@
145 <Compile Include="world\Avatar.cs"> 148 <Compile Include="world\Avatar.cs">
146 <SubType>Code</SubType> 149 <SubType>Code</SubType>
147 </Compile> 150 </Compile>
151 <Compile Include="world\AvatarAnimations.cs">
152 <SubType>Code</SubType>
153 </Compile>
148 <Compile Include="world\Entity.cs"> 154 <Compile Include="world\Entity.cs">
149 <SubType>Code</SubType> 155 <SubType>Code</SubType>
150 </Compile> 156 </Compile>
@@ -171,4 +177,4 @@
171 <PostBuildEvent> 177 <PostBuildEvent>
172 </PostBuildEvent> 178 </PostBuildEvent>
173 </PropertyGroup> 179 </PropertyGroup>
174</Project> \ No newline at end of file 180</Project>
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
new file mode 100644
index 0000000..dce4dc1
--- /dev/null
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -0,0 +1,68 @@
1<?xml version="1.0" ?>
2<project name="OpenSim.RegionServer" default="build">
3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}">
8 </fileset>
9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >
12 </resources>
13 <sources failonempty="true">
14 <include name="Grid.cs" />
15 <include name="OpenSimApplication.cs" />
16 <include name="OpenSimMain.cs" />
17 <include name="OpenSimRoot.cs" />
18 <include name="QueItem.cs" />
19 <include name="SimClient.cs" />
20 <include name="SimConsole.cs" />
21 <include name="VersionInfo.cs" />
22 <include name="Assets/AssetCache.cs" />
23 <include name="Assets/InventoryCache.cs" />
24 <include name="CAPS/SimHttp.cs" />
25 <include name="types/Mesh.cs" />
26 <include name="types/Triangle.cs" />
27 <include name="UserServer/LocalUserProfileManager.cs" />
28 <include name="UserServer/LoginServer.cs" />
29 <include name="world/Avatar.cs" />
30 <include name="world/AvatarAnimations.cs" />
31 <include name="world/Entity.cs" />
32 <include name="world/Primitive.cs" />
33 <include name="world/ScriptEngine.cs" />
34 <include name="world/SurfacePatch.cs" />
35 <include name="world/World.cs" />
36 <include name="world/scripting/IScript.cs" />
37 </sources>
38 <references basedir="${project::get-base-directory()}">
39 <lib>
40 <include name="${project::get-base-directory()}" />
41 <include name="${project::get-base-directory()}/${build.dir}" />
42 </lib>
43 <include name="System.dll" />
44 <include name="System.Xml.dll" />
45 <include name="../bin/libsecondlife.dll" />
46 <include name="../bin/Axiom.MathLib.dll" />
47 <include name="../bin/Db4objects.Db4o.dll" />
48 <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
49 <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" />
50 <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
51 </references>
52 </csc>
53 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
54 <mkdir dir="${project::get-base-directory()}/../bin/"/>
55 <copy todir="${project::get-base-directory()}/../bin/">
56 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
57 <include name="*.dll"/>
58 <include name="*.exe"/>
59 </fileset>
60 </copy>
61 </target>
62 <target name="clean">
63 <delete dir="${bin.dir}" failonerror="false" />
64 <delete dir="${obj.dir}" failonerror="false" />
65 </target>
66 <target name="doc" description="Creates documentation.">
67 </target>
68</project>
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index b2bc0b3..cb184e8 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -48,9 +48,6 @@ using OpenSim.Physics.Manager;
48 48
49namespace OpenSim 49namespace OpenSim
50{ 50{
51 /// <summary>
52 ///
53 /// </summary>
54 public class OpenSimMain : OpenSimApplication 51 public class OpenSimMain : OpenSimApplication
55 { 52 {
56 private Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>(); 53 private Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
@@ -66,76 +63,11 @@ namespace OpenSim
66 63
67 private System.Timers.Timer timer1 = new System.Timers.Timer(); 64 private System.Timers.Timer timer1 = new System.Timers.Timer();
68 private string ConfigDll = "OpenSim.Config.SimConfigDb4o.dll"; 65 private string ConfigDll = "OpenSim.Config.SimConfigDb4o.dll";
69 private string _physicsEngine = "basicphysics"; 66 public string _physicsEngine = "basicphysics";
70 public bool sandbox = false; 67 public bool sandbox = false;
71 public bool loginserver = false; 68 public bool loginserver = false;
72 69
73 [STAThread] 70 public OpenSimMain()
74 public static void Main(string[] args)
75 {
76 Console.WriteLine("OpenSim " + VersionInfo.Version + "\n");
77 Console.WriteLine("Starting...\n");
78 OpenSim.Framework.Console.MainConsole.Instance = new SimConsole(OpenSim.Framework.Console.ConsoleBase.ConsoleType.Local, "", 0);
79
80 //OpenSimRoot.instance = new OpenSimRoot();
81 OpenSimMain sim = new OpenSimMain();
82 OpenSimRoot.Instance.Application = sim;
83
84 sim.sandbox = false;
85 sim.loginserver = false;
86 sim._physicsEngine = "basicphysics";
87
88 for (int i = 0; i < args.Length; i++)
89 {
90 if (args[i] == "-sandbox")
91 {
92 sim.sandbox = true;
93 OpenSimRoot.Instance.Sandbox = true;
94 }
95
96 if (args[i] == "-loginserver")
97 {
98 sim.loginserver = true;
99 }
100 if (args[i] == "-realphysx")
101 {
102 sim._physicsEngine = "RealPhysX";
103 OpenSim.world.Avatar.PhysicsEngineFlying = true;
104 }
105 }
106
107
108 OpenSimRoot.Instance.GridServers = new Grid();
109 if (sim.sandbox)
110 {
111 OpenSimRoot.Instance.GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll";
112 OpenSimRoot.Instance.GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll";
113 OpenSimRoot.Instance.GridServers.Initialise();
114 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting in Sandbox mode");
115 }
116 else
117 {
118 OpenSimRoot.Instance.GridServers.AssetDll = "OpenSim.GridInterfaces.Remote.dll";
119 OpenSimRoot.Instance.GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll";
120 OpenSimRoot.Instance.GridServers.Initialise();
121 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting in Grid mode");
122 }
123
124 if (sim.loginserver && sim.sandbox)
125 {
126 LoginServer loginServer = new LoginServer(OpenSimRoot.Instance.GridServers.GridServer);
127 loginServer.Startup();
128 }
129
130 OpenSimRoot.Instance.StartUp();
131
132 while (true)
133 {
134 OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt();
135 }
136 }
137
138 private OpenSimMain()
139 { 71 {
140 } 72 }
141 73
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
index 993df11..6c9a3fb 100644
--- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
@@ -3,7 +3,7 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{F6AA425C-A307-4685-85E4-556C7CCEDD93}</ProjectGuid> 6 <ProjectGuid>{455B4201-F942-48A1-ADE3-E38641ABB4D2}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
@@ -78,13 +78,13 @@
78 <ItemGroup> 78 <ItemGroup>
79 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj"> 79 <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
80 <Name>OpenSim.Framework</Name> 80 <Name>OpenSim.Framework</Name>
81 <Project>{E267CE4E-F355-4A27-8D0D-CA48FEE7F978}</Project> 81 <Project>{71848571-2BC0-41DC-A69C-28B6DDB8C8CE}</Project>
82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
83 <Private>False</Private> 83 <Private>False</Private>
84 </ProjectReference> 84 </ProjectReference>
85 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 85 <ProjectReference Include="..\..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
86 <Name>OpenSim.Framework.Console</Name> 86 <Name>OpenSim.Framework.Console</Name>
87 <Project>{1492353A-6133-4557-9AD8-6E24386D70F8}</Project> 87 <Project>{CE124F22-69FC-4499-AE68-1B877C5898C4}</Project>
88 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 88 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
89 <Private>False</Private> 89 <Private>False</Private>
90 </ProjectReference> 90 </ProjectReference>
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index 752d0ab..44e8597 100644
--- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -21,7 +21,7 @@
21 <include name="${project::get-base-directory()}/${build.dir}" /> 21 <include name="${project::get-base-directory()}/${build.dir}" />
22 </lib> 22 </lib>
23 <include name="System.dll" /> 23 <include name="System.dll" />
24 <include name="System.Xml.dll.dll" /> 24 <include name="System.Xml.dll" />
25 <include name="../../bin/Db4objects.Db4o.dll" /> 25 <include name="../../bin/Db4objects.Db4o.dll" />
26 <include name="../../bin/libsecondlife.dll" /> 26 <include name="../../bin/libsecondlife.dll" />
27 <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" /> 27 <include name="../../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
diff --git a/OpenSim.build b/OpenSim.build
index 8f5c415..e0738a6 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -53,9 +53,10 @@
53 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" /> 53 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" />
54 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> 54 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
55 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" /> 55 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" />
56 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" />
56 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" /> 57 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
57 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" /> 58 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />
58 <nant buildfile="OpenSim.RegionServer/OpenSim.exe.build" target="clean" /> 59 <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" />
59 </target> 60 </target>
60 61
61 <target name="build" depends="init" description=""> 62 <target name="build" depends="init" description="">
@@ -67,7 +68,8 @@
67 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" /> 68 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" />
68 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" /> 69 <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" />
69 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" /> 70 <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" />
70 <nant buildfile="OpenSim.RegionServer/OpenSim.exe.build" target="build" /> 71 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" />
72 <nant buildfile="OpenSim/OpenSim.exe.build" target="build" />
71 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" /> 73 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" />
72 </target> 74 </target>
73 75
@@ -86,9 +88,10 @@
86 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" /> 88 <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" />
87 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> 89 <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
88 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" /> 90 <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" />
91 <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" />
89 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" /> 92 <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
90 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" /> 93 <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />
91 <nant buildfile="OpenSim.RegionServer/OpenSim.exe.build" target="doc" /> 94 <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" />
92 </target> 95 </target>
93 96
94</project> 97</project>
diff --git a/OpenSim.sln b/OpenSim.sln
index dd08d0b..bd0abb1 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,73 +1,99 @@
1Microsoft Visual Studio Solution File, Format Version 9.00 1Microsoft Visual Studio Solution File, Format Version 9.00
2# Visual Studio 2005 2# Visual Studio 2005
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{401245BB-2D4A-47D2-B377-179F62277E3E}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.PhysXPlugin", "OpenSim.Physics\PhysXPlugin\OpenSim.Physics.PhysXPlugin.csproj", "{62652FE9-20CC-4855-9D1C-6C1CCD706CC1}"
4EndProject 4EndProject
5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{1492353A-6133-4557-9AD8-6E24386D70F8}" 5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{CE124F22-69FC-4499-AE68-1B877C5898C4}"
6EndProject 6EndProject
7Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{ED9A6AEE-92B9-45E1-9834-4D6DDBBBAEA0}" 7Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Config.SimConfigDb4o", "OpenSim.Config\SimConfigDb4o\OpenSim.Config.SimConfigDb4o.csproj", "{C77FAE85-A786-4DEB-9AEB-46B75169079C}"
8EndProject 8EndProject
9Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{B045B311-34DF-4643-9C06-10E5BCF1B227}" 9Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.BasicPhysicsPlugin", "OpenSim.Physics\BasicPhysicsPlugin\OpenSim.Physics.BasicPhysicsPlugin.csproj", "{0A4D5E28-88B6-474E-AC5F-3F99822DD976}"
10EndProject 10EndProject
11Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{B1BC5710-EA90-4566-A6A4-93D90EC19449}" 11Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Remote", "OpenSim.GridInterfaces\Remote\OpenSim.GridInterfaces.Remote.csproj", "{E0C662BD-1B64-4782-B8F2-9511255DB971}"
12EndProject 12EndProject
13Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{F6AA425C-A307-4685-85E4-556C7CCEDD93}" 13Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageDb4o", "OpenSim.Storage\LocalStorageDb4o\OpenSim.Storage.LocalStorageDb4o.csproj", "{455B4201-F942-48A1-ADE3-E38641ABB4D2}"
14EndProject 14EndProject
15Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{E267CE4E-F355-4A27-8D0D-CA48FEE7F978}" 15Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{71848571-2BC0-41DC-A69C-28B6DDB8C8CE}"
16EndProject 16EndProject
17Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{0FD686EA-1917-469E-A885-1D9DEEA1D340}" 17Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{457CE564-0922-4F15-846F-147E5BE62D67}"
18EndProject 18EndProject
19Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{9257C89E-0894-4CE5-B25D-3D6EA50F38D0}" 19Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.Manager", "OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj", "{79C8C9A7-EF80-426D-B815-AC88E7998DFE}"
20EndProject 20EndProject
21Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim.RegionServer\OpenSim.csproj", "{6E597AD4-1F7D-4389-B04C-403EF1046AAB}" 21Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Local", "OpenSim.GridInterfaces\Local\OpenSim.GridInterfaces.Local.csproj", "{5A852B3E-E770-4B00-A34B-1F8B4ABDA570}"
22EndProject
23Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\OpenSim.csproj", "{778D384D-088A-42DF-A683-2244BD9530DE}"
22EndProject 24EndProject
23Global 25Global
24 GlobalSection(SolutionConfigurationPlatforms) = preSolution 26 GlobalSection(SolutionConfigurationPlatforms) = preSolution
25 Debug|Any CPU = Debug|Any CPU 27 Debug|Any CPU = Debug|Any CPU
26 Release|Any CPU = Release|Any CPU 28 Release|Any CPU = Release|Any CPU
27 EndGlobalSection 29 EndGlobalSection
28 GlobalSection(ProjectConfigurationPlatforms) = postSolution 30 GlobalSection(ProjectDependencies) = postSolution
29 {401245BB-2D4A-47D2-B377-179F62277E3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 31 ({62652FE9-20CC-4855-9D1C-6C1CCD706CC1}).3 = ({79C8C9A7-EF80-426D-B815-AC88E7998DFE})
30 {401245BB-2D4A-47D2-B377-179F62277E3E}.Debug|Any CPU.Build.0 = Debug|Any CPU 32 ({C77FAE85-A786-4DEB-9AEB-46B75169079C}).5 = ({71848571-2BC0-41DC-A69C-28B6DDB8C8CE})
31 {401245BB-2D4A-47D2-B377-179F62277E3E}.Release|Any CPU.ActiveCfg = Release|Any CPU 33 ({C77FAE85-A786-4DEB-9AEB-46B75169079C}).6 = ({CE124F22-69FC-4499-AE68-1B877C5898C4})
32 {401245BB-2D4A-47D2-B377-179F62277E3E}.Release|Any CPU.Build.0 = Release|Any CPU 34 ({0A4D5E28-88B6-474E-AC5F-3F99822DD976}).2 = ({79C8C9A7-EF80-426D-B815-AC88E7998DFE})
33 {1492353A-6133-4557-9AD8-6E24386D70F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 35 ({E0C662BD-1B64-4782-B8F2-9511255DB971}).3 = ({71848571-2BC0-41DC-A69C-28B6DDB8C8CE})
34 {1492353A-6133-4557-9AD8-6E24386D70F8}.Debug|Any CPU.Build.0 = Debug|Any CPU 36 ({E0C662BD-1B64-4782-B8F2-9511255DB971}).4 = ({CE124F22-69FC-4499-AE68-1B877C5898C4})
35 {1492353A-6133-4557-9AD8-6E24386D70F8}.Release|Any CPU.ActiveCfg = Release|Any CPU 37 ({455B4201-F942-48A1-ADE3-E38641ABB4D2}).4 = ({71848571-2BC0-41DC-A69C-28B6DDB8C8CE})
36 {1492353A-6133-4557-9AD8-6E24386D70F8}.Release|Any CPU.Build.0 = Release|Any CPU 38 ({455B4201-F942-48A1-ADE3-E38641ABB4D2}).5 = ({CE124F22-69FC-4499-AE68-1B877C5898C4})
37 {ED9A6AEE-92B9-45E1-9834-4D6DDBBBAEA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 39 ({457CE564-0922-4F15-846F-147E5BE62D67}).5 = ({CE124F22-69FC-4499-AE68-1B877C5898C4})
38 {ED9A6AEE-92B9-45E1-9834-4D6DDBBBAEA0}.Debug|Any CPU.Build.0 = Debug|Any CPU 40 ({457CE564-0922-4F15-846F-147E5BE62D67}).6 = ({79C8C9A7-EF80-426D-B815-AC88E7998DFE})
39 {ED9A6AEE-92B9-45E1-9834-4D6DDBBBAEA0}.Release|Any CPU.ActiveCfg = Release|Any CPU 41 ({457CE564-0922-4F15-846F-147E5BE62D67}).7 = ({71848571-2BC0-41DC-A69C-28B6DDB8C8CE})
40 {ED9A6AEE-92B9-45E1-9834-4D6DDBBBAEA0}.Release|Any CPU.Build.0 = Release|Any CPU 42 ({79C8C9A7-EF80-426D-B815-AC88E7998DFE}).3 = ({CE124F22-69FC-4499-AE68-1B877C5898C4})
41 {B045B311-34DF-4643-9C06-10E5BCF1B227}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 43 ({5A852B3E-E770-4B00-A34B-1F8B4ABDA570}).4 = ({71848571-2BC0-41DC-A69C-28B6DDB8C8CE})
42 {B045B311-34DF-4643-9C06-10E5BCF1B227}.Debug|Any CPU.Build.0 = Debug|Any CPU 44 ({5A852B3E-E770-4B00-A34B-1F8B4ABDA570}).5 = ({CE124F22-69FC-4499-AE68-1B877C5898C4})
43 {B045B311-34DF-4643-9C06-10E5BCF1B227}.Release|Any CPU.ActiveCfg = Release|Any CPU 45 ({778D384D-088A-42DF-A683-2244BD9530DE}).5 = ({71848571-2BC0-41DC-A69C-28B6DDB8C8CE})
44 {B045B311-34DF-4643-9C06-10E5BCF1B227}.Release|Any CPU.Build.0 = Release|Any CPU 46 ({778D384D-088A-42DF-A683-2244BD9530DE}).6 = ({CE124F22-69FC-4499-AE68-1B877C5898C4})
45 {B1BC5710-EA90-4566-A6A4-93D90EC19449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 47 ({778D384D-088A-42DF-A683-2244BD9530DE}).7 = ({79C8C9A7-EF80-426D-B815-AC88E7998DFE})
46 {B1BC5710-EA90-4566-A6A4-93D90EC19449}.Debug|Any CPU.Build.0 = Debug|Any CPU 48 ({778D384D-088A-42DF-A683-2244BD9530DE}).8 = ({457CE564-0922-4F15-846F-147E5BE62D67})
47 {B1BC5710-EA90-4566-A6A4-93D90EC19449}.Release|Any CPU.ActiveCfg = Release|Any CPU 49 EndGlobalSection
48 {B1BC5710-EA90-4566-A6A4-93D90EC19449}.Release|Any CPU.Build.0 = Release|Any CPU 50 GlobalSection(ProjectConfigurationPlatforms) = postSolution
49 {F6AA425C-A307-4685-85E4-556C7CCEDD93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 51 {62652FE9-20CC-4855-9D1C-6C1CCD706CC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50 {F6AA425C-A307-4685-85E4-556C7CCEDD93}.Debug|Any CPU.Build.0 = Debug|Any CPU 52 {62652FE9-20CC-4855-9D1C-6C1CCD706CC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
51 {F6AA425C-A307-4685-85E4-556C7CCEDD93}.Release|Any CPU.ActiveCfg = Release|Any CPU 53 {62652FE9-20CC-4855-9D1C-6C1CCD706CC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
52 {F6AA425C-A307-4685-85E4-556C7CCEDD93}.Release|Any CPU.Build.0 = Release|Any CPU 54 {62652FE9-20CC-4855-9D1C-6C1CCD706CC1}.Release|Any CPU.Build.0 = Release|Any CPU
53 {E267CE4E-F355-4A27-8D0D-CA48FEE7F978}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 55 {CE124F22-69FC-4499-AE68-1B877C5898C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54 {E267CE4E-F355-4A27-8D0D-CA48FEE7F978}.Debug|Any CPU.Build.0 = Debug|Any CPU 56 {CE124F22-69FC-4499-AE68-1B877C5898C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
55 {E267CE4E-F355-4A27-8D0D-CA48FEE7F978}.Release|Any CPU.ActiveCfg = Release|Any CPU 57 {CE124F22-69FC-4499-AE68-1B877C5898C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
56 {E267CE4E-F355-4A27-8D0D-CA48FEE7F978}.Release|Any CPU.Build.0 = Release|Any CPU 58 {CE124F22-69FC-4499-AE68-1B877C5898C4}.Release|Any CPU.Build.0 = Release|Any CPU
57 {0FD686EA-1917-469E-A885-1D9DEEA1D340}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 59 {C77FAE85-A786-4DEB-9AEB-46B75169079C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58 {0FD686EA-1917-469E-A885-1D9DEEA1D340}.Debug|Any CPU.Build.0 = Debug|Any CPU 60 {C77FAE85-A786-4DEB-9AEB-46B75169079C}.Debug|Any CPU.Build.0 = Debug|Any CPU
59 {0FD686EA-1917-469E-A885-1D9DEEA1D340}.Release|Any CPU.ActiveCfg = Release|Any CPU 61 {C77FAE85-A786-4DEB-9AEB-46B75169079C}.Release|Any CPU.ActiveCfg = Release|Any CPU
60 {0FD686EA-1917-469E-A885-1D9DEEA1D340}.Release|Any CPU.Build.0 = Release|Any CPU 62 {C77FAE85-A786-4DEB-9AEB-46B75169079C}.Release|Any CPU.Build.0 = Release|Any CPU
61 {9257C89E-0894-4CE5-B25D-3D6EA50F38D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 63 {0A4D5E28-88B6-474E-AC5F-3F99822DD976}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62 {9257C89E-0894-4CE5-B25D-3D6EA50F38D0}.Debug|Any CPU.Build.0 = Debug|Any CPU 64 {0A4D5E28-88B6-474E-AC5F-3F99822DD976}.Debug|Any CPU.Build.0 = Debug|Any CPU
63 {9257C89E-0894-4CE5-B25D-3D6EA50F38D0}.Release|Any CPU.ActiveCfg = Release|Any CPU 65 {0A4D5E28-88B6-474E-AC5F-3F99822DD976}.Release|Any CPU.ActiveCfg = Release|Any CPU
64 {9257C89E-0894-4CE5-B25D-3D6EA50F38D0}.Release|Any CPU.Build.0 = Release|Any CPU 66 {0A4D5E28-88B6-474E-AC5F-3F99822DD976}.Release|Any CPU.Build.0 = Release|Any CPU
65 {6E597AD4-1F7D-4389-B04C-403EF1046AAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 67 {E0C662BD-1B64-4782-B8F2-9511255DB971}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66 {6E597AD4-1F7D-4389-B04C-403EF1046AAB}.Debug|Any CPU.Build.0 = Debug|Any CPU 68 {E0C662BD-1B64-4782-B8F2-9511255DB971}.Debug|Any CPU.Build.0 = Debug|Any CPU
67 {6E597AD4-1F7D-4389-B04C-403EF1046AAB}.Release|Any CPU.ActiveCfg = Release|Any CPU 69 {E0C662BD-1B64-4782-B8F2-9511255DB971}.Release|Any CPU.ActiveCfg = Release|Any CPU
68 {6E597AD4-1F7D-4389-B04C-403EF1046AAB}.Release|Any CPU.Build.0 = Release|Any CPU 70 {E0C662BD-1B64-4782-B8F2-9511255DB971}.Release|Any CPU.Build.0 = Release|Any CPU
69 EndGlobalSection 71 {455B4201-F942-48A1-ADE3-E38641ABB4D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70 GlobalSection(SolutionProperties) = preSolution 72 {455B4201-F942-48A1-ADE3-E38641ABB4D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
71 HideSolutionNode = FALSE 73 {455B4201-F942-48A1-ADE3-E38641ABB4D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
72 EndGlobalSection 74 {455B4201-F942-48A1-ADE3-E38641ABB4D2}.Release|Any CPU.Build.0 = Release|Any CPU
75 {71848571-2BC0-41DC-A69C-28B6DDB8C8CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
76 {71848571-2BC0-41DC-A69C-28B6DDB8C8CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
77 {71848571-2BC0-41DC-A69C-28B6DDB8C8CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
78 {71848571-2BC0-41DC-A69C-28B6DDB8C8CE}.Release|Any CPU.Build.0 = Release|Any CPU
79 {457CE564-0922-4F15-846F-147E5BE62D67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
80 {457CE564-0922-4F15-846F-147E5BE62D67}.Debug|Any CPU.Build.0 = Debug|Any CPU
81 {457CE564-0922-4F15-846F-147E5BE62D67}.Release|Any CPU.ActiveCfg = Release|Any CPU
82 {457CE564-0922-4F15-846F-147E5BE62D67}.Release|Any CPU.Build.0 = Release|Any CPU
83 {79C8C9A7-EF80-426D-B815-AC88E7998DFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
84 {79C8C9A7-EF80-426D-B815-AC88E7998DFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
85 {79C8C9A7-EF80-426D-B815-AC88E7998DFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
86 {79C8C9A7-EF80-426D-B815-AC88E7998DFE}.Release|Any CPU.Build.0 = Release|Any CPU
87 {5A852B3E-E770-4B00-A34B-1F8B4ABDA570}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
88 {5A852B3E-E770-4B00-A34B-1F8B4ABDA570}.Debug|Any CPU.Build.0 = Debug|Any CPU
89 {5A852B3E-E770-4B00-A34B-1F8B4ABDA570}.Release|Any CPU.ActiveCfg = Release|Any CPU
90 {5A852B3E-E770-4B00-A34B-1F8B4ABDA570}.Release|Any CPU.Build.0 = Release|Any CPU
91 {778D384D-088A-42DF-A683-2244BD9530DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
92 {778D384D-088A-42DF-A683-2244BD9530DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
93 {778D384D-088A-42DF-A683-2244BD9530DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
94 {778D384D-088A-42DF-A683-2244BD9530DE}.Release|Any CPU.Build.0 = Release|Any CPU
95 EndGlobalSection
96 GlobalSection(SolutionProperties) = preSolution
97 HideSolutionNode = FALSE
98 EndGlobalSection
73EndGlobal 99EndGlobal
diff --git a/OpenSim/OpenSim.csproj b/OpenSim/OpenSim.csproj
new file mode 100644
index 0000000..12ead94
--- /dev/null
+++ b/OpenSim/OpenSim.csproj
@@ -0,0 +1,120 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{778D384D-088A-42DF-A683-2244BD9530DE}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon>
10 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName>
12 <AssemblyName>OpenSim</AssemblyName>
13 <DefaultClientScript>JScript</DefaultClientScript>
14 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign>
17 <OutputType>Exe</OutputType>
18 <AppDesignerFolder></AppDesignerFolder>
19 <RootNamespace>OpenSim</RootNamespace>
20 <StartupObject></StartupObject>
21 <FileUpgradeFlags>
22 </FileUpgradeFlags>
23 </PropertyGroup>
24 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
25 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
26 <BaseAddress>285212672</BaseAddress>
27 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
28 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile>
32 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize>
35 <OutputPath>..\bin\</OutputPath>
36 <RegisterForComInterop>False</RegisterForComInterop>
37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn>
41 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
44 <BaseAddress>285212672</BaseAddress>
45 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
46 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile>
50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize>
53 <OutputPath>..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn>
59 </PropertyGroup>
60 <ItemGroup>
61 <Reference Include="System" >
62 <HintPath>System.dll</HintPath>
63 <Private>False</Private>
64 </Reference>
65 <Reference Include="System.Xml" >
66 <HintPath>System.Xml.dll</HintPath>
67 <Private>False</Private>
68 </Reference>
69 <Reference Include="libsecondlife.dll" >
70 <HintPath>..\bin\libsecondlife.dll</HintPath>
71 <Private>False</Private>
72 </Reference>
73 <Reference Include="Axiom.MathLib.dll" >
74 <HintPath>..\bin\Axiom.MathLib.dll</HintPath>
75 <Private>False</Private>
76 </Reference>
77 <Reference Include="Db4objects.Db4o.dll" >
78 <HintPath>..\bin\Db4objects.Db4o.dll</HintPath>
79 <Private>False</Private>
80 </Reference>
81 </ItemGroup>
82 <ItemGroup>
83 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
84 <Name>OpenSim.Framework</Name>
85 <Project>{71848571-2BC0-41DC-A69C-28B6DDB8C8CE}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private>
88 </ProjectReference>
89 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
90 <Name>OpenSim.Framework.Console</Name>
91 <Project>{CE124F22-69FC-4499-AE68-1B877C5898C4}</Project>
92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
93 <Private>False</Private>
94 </ProjectReference>
95 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
96 <Name>OpenSim.Physics.Manager</Name>
97 <Project>{79C8C9A7-EF80-426D-B815-AC88E7998DFE}</Project>
98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
99 <Private>False</Private>
100 </ProjectReference>
101 <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
102 <Name>OpenSim.RegionServer</Name>
103 <Project>{457CE564-0922-4F15-846F-147E5BE62D67}</Project>
104 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
105 <Private>False</Private>
106 </ProjectReference>
107 </ItemGroup>
108 <ItemGroup>
109 <Compile Include="RegionServer.cs">
110 <SubType>Code</SubType>
111 </Compile>
112 </ItemGroup>
113 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
114 <PropertyGroup>
115 <PreBuildEvent>
116 </PreBuildEvent>
117 <PostBuildEvent>
118 </PostBuildEvent>
119 </PropertyGroup>
120</Project>
diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build
new file mode 100644
index 0000000..7d69d90
--- /dev/null
+++ b/OpenSim/OpenSim.exe.build
@@ -0,0 +1,47 @@
1<?xml version="1.0" ?>
2<project name="OpenSim" default="build">
3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}">
8 </fileset>
9 </copy>
10 <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
11 <resources prefix="OpenSim" dynamicprefix="true" >
12 </resources>
13 <sources failonempty="true">
14 <include name="RegionServer.cs" />
15 </sources>
16 <references basedir="${project::get-base-directory()}">
17 <lib>
18 <include name="${project::get-base-directory()}" />
19 <include name="${project::get-base-directory()}/${build.dir}" />
20 </lib>
21 <include name="System.dll" />
22 <include name="System.Xml.dll" />
23 <include name="../bin/libsecondlife.dll" />
24 <include name="../bin/Axiom.MathLib.dll" />
25 <include name="../bin/Db4objects.Db4o.dll" />
26 <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
27 <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
28 <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" />
29 <include name="../OpenSim.RegionServer/${build.dir}/OpenSim.RegionServer.dll" />
30 </references>
31 </csc>
32 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
33 <mkdir dir="${project::get-base-directory()}/../bin/"/>
34 <copy todir="${project::get-base-directory()}/../bin/">
35 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
36 <include name="*.dll"/>
37 <include name="*.exe"/>
38 </fileset>
39 </copy>
40 </target>
41 <target name="clean">
42 <delete dir="${bin.dir}" failonerror="false" />
43 <delete dir="${obj.dir}" failonerror="false" />
44 </target>
45 <target name="doc" description="Creates documentation.">
46 </target>
47</project>
diff --git a/OpenSim/RegionServer.cs b/OpenSim/RegionServer.cs
new file mode 100644
index 0000000..6fabe3f
--- /dev/null
+++ b/OpenSim/RegionServer.cs
@@ -0,0 +1,75 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.UserServer;
5
6namespace OpenSim
7{
8 public class RegionServer : OpenSimMain
9 {
10 [STAThread]
11 public static void Main(string[] args)
12 {
13 Console.WriteLine("OpenSim " + VersionInfo.Version + "\n");
14 Console.WriteLine("Starting...\n");
15 OpenSim.Framework.Console.MainConsole.Instance = new SimConsole(OpenSim.Framework.Console.ConsoleBase.ConsoleType.Local, "", 0);
16
17 //OpenSimRoot.instance = new OpenSimRoot();
18 OpenSimMain sim = new OpenSimMain();
19 OpenSimRoot.Instance.Application = sim;
20
21 sim.sandbox = false;
22 sim.loginserver = false;
23 sim._physicsEngine = "basicphysics";
24
25 for (int i = 0; i < args.Length; i++)
26 {
27 if (args[i] == "-sandbox")
28 {
29 sim.sandbox = true;
30 OpenSimRoot.Instance.Sandbox = true;
31 }
32
33 if (args[i] == "-loginserver")
34 {
35 sim.loginserver = true;
36 }
37 if (args[i] == "-realphysx")
38 {
39 sim._physicsEngine = "RealPhysX";
40 OpenSim.world.Avatar.PhysicsEngineFlying = true;
41 }
42 }
43
44
45 OpenSimRoot.Instance.GridServers = new Grid();
46 if (sim.sandbox)
47 {
48 OpenSimRoot.Instance.GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll";
49 OpenSimRoot.Instance.GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll";
50 OpenSimRoot.Instance.GridServers.Initialise();
51 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting in Sandbox mode");
52 }
53 else
54 {
55 OpenSimRoot.Instance.GridServers.AssetDll = "OpenSim.GridInterfaces.Remote.dll";
56 OpenSimRoot.Instance.GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll";
57 OpenSimRoot.Instance.GridServers.Initialise();
58 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Starting in Grid mode");
59 }
60
61 if (sim.loginserver && sim.sandbox)
62 {
63 LoginServer loginServer = new LoginServer(OpenSimRoot.Instance.GridServers.GridServer);
64 loginServer.Startup();
65 }
66
67 OpenSimRoot.Instance.StartUp();
68
69 while (true)
70 {
71 OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt();
72 }
73 }
74 }
75}
diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln
index a0bea09..95a3f0f 100644
--- a/Prebuild/Prebuild.sln
+++ b/Prebuild/Prebuild.sln
@@ -1,25 +1,25 @@
1Microsoft Visual Studio Solution File, Format Version 9.00 1Microsoft Visual Studio Solution File, Format Version 9.00
2# Visual Studio 2005 2# Visual Studio 2005
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{A5CC8344-BEE4-442E-92F1-FBCB05D6AB78}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{F7B3D806-20FD-4181-86F1-96E24A9EC850}"
4EndProject 4EndProject
5Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{468F1D07-AD17-4CC3-ABD0-2CA268E4E1A6}" 5Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{468F1D07-AD17-4CC3-ABD0-2CA268E4E1A6}"
6 ProjectSection(SolutionItems) = preProject 6 ProjectSection(SolutionItems) = preProject
7 prebuild = prebuild
8 prebuild.xml = prebuild.xml 7 prebuild.xml = prebuild.xml
8 prebuild = prebuild
9 EndProjectSection 9 EndProjectSection
10EndProject 10EndProject
11Global 11Global
12 GlobalSection(SolutionConfigurationPlatforms) = preSolution 12 GlobalSection(SolutionConfigurationPlatforms) = preSolution
13 Debug|Any CPU = Debug|Any CPU 13 Debug|Any CPU = Debug|Any CPU
14 Release|Any CPU = Release|Any CPU 14 Release|Any CPU = Release|Any CPU
15 EndGlobalSection 15 EndGlobalSection
16 GlobalSection(ProjectConfigurationPlatforms) = postSolution 16 GlobalSection(ProjectConfigurationPlatforms) = postSolution
17 {A5CC8344-BEE4-442E-92F1-FBCB05D6AB78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 17 {F7B3D806-20FD-4181-86F1-96E24A9EC850}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
18 {A5CC8344-BEE4-442E-92F1-FBCB05D6AB78}.Debug|Any CPU.Build.0 = Debug|Any CPU 18 {F7B3D806-20FD-4181-86F1-96E24A9EC850}.Debug|Any CPU.Build.0 = Debug|Any CPU
19 {A5CC8344-BEE4-442E-92F1-FBCB05D6AB78}.Release|Any CPU.ActiveCfg = Release|Any CPU 19 {F7B3D806-20FD-4181-86F1-96E24A9EC850}.Release|Any CPU.ActiveCfg = Release|Any CPU
20 {A5CC8344-BEE4-442E-92F1-FBCB05D6AB78}.Release|Any CPU.Build.0 = Release|Any CPU 20 {F7B3D806-20FD-4181-86F1-96E24A9EC850}.Release|Any CPU.Build.0 = Release|Any CPU
21 EndGlobalSection 21 EndGlobalSection
22 GlobalSection(SolutionProperties) = preSolution 22 GlobalSection(SolutionProperties) = preSolution
23 HideSolutionNode = FALSE 23 HideSolutionNode = FALSE
24 EndGlobalSection 24 EndGlobalSection
25EndGlobal 25EndGlobal
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj
index 82589c2..17d5089 100644
--- a/Prebuild/src/Prebuild.csproj
+++ b/Prebuild/src/Prebuild.csproj
@@ -1,9 +1,9 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{A5CC8344-BEE4-442E-92F1-FBCB05D6AB78}</ProjectGuid> 6 <ProjectGuid>{F7B3D806-20FD-4181-86F1-96E24A9EC850}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon>App.ico</ApplicationIcon> 9 <ApplicationIcon>App.ico</ApplicationIcon>
@@ -17,8 +17,7 @@
17 <DefaultTargetSchema>IE50</DefaultTargetSchema> 17 <DefaultTargetSchema>IE50</DefaultTargetSchema>
18 <DelaySign>false</DelaySign> 18 <DelaySign>false</DelaySign>
19 <OutputType>Exe</OutputType> 19 <OutputType>Exe</OutputType>
20 <AppDesignerFolder> 20 <AppDesignerFolder></AppDesignerFolder>
21 </AppDesignerFolder>
22 <RootNamespace>Prebuild</RootNamespace> 21 <RootNamespace>Prebuild</RootNamespace>
23 <StartupObject>Prebuild.Prebuild</StartupObject> 22 <StartupObject>Prebuild.Prebuild</StartupObject>
24 <FileUpgradeFlags> 23 <FileUpgradeFlags>
@@ -31,12 +30,11 @@
31 <ConfigurationOverrideFile> 30 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 31 </ConfigurationOverrideFile>
33 <DefineConstants>DEBUG;TRACE</DefineConstants> 32 <DefineConstants>DEBUG;TRACE</DefineConstants>
34 <DocumentationFile> 33 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 34 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 35 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 36 <Optimize>False</Optimize>
39 <OutputPath>..\bin\</OutputPath> 37 <OutputPath>..\..\bin\</OutputPath>
40 <RegisterForComInterop>False</RegisterForComInterop> 38 <RegisterForComInterop>False</RegisterForComInterop>
41 <RemoveIntegerChecks>False</RemoveIntegerChecks> 39 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 40 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,12 +48,11 @@
50 <ConfigurationOverrideFile> 48 <ConfigurationOverrideFile>
51 </ConfigurationOverrideFile> 49 </ConfigurationOverrideFile>
52 <DefineConstants>TRACE</DefineConstants> 50 <DefineConstants>TRACE</DefineConstants>
53 <DocumentationFile> 51 <DocumentationFile></DocumentationFile>
54 </DocumentationFile>
55 <DebugSymbols>False</DebugSymbols> 52 <DebugSymbols>False</DebugSymbols>
56 <FileAlignment>4096</FileAlignment> 53 <FileAlignment>4096</FileAlignment>
57 <Optimize>True</Optimize> 54 <Optimize>True</Optimize>
58 <OutputPath>..\bin\</OutputPath> 55 <OutputPath>..\..\bin\</OutputPath>
59 <RegisterForComInterop>False</RegisterForComInterop> 56 <RegisterForComInterop>False</RegisterForComInterop>
60 <RemoveIntegerChecks>False</RemoveIntegerChecks> 57 <RemoveIntegerChecks>False</RemoveIntegerChecks>
61 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 58 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -63,6 +60,20 @@
63 <NoWarn>1595</NoWarn> 60 <NoWarn>1595</NoWarn>
64 </PropertyGroup> 61 </PropertyGroup>
65 <ItemGroup> 62 <ItemGroup>
63 <Reference Include="System.EnterpriseServices" >
64 <HintPath>System.EnterpriseServices.dll</HintPath>
65 <Private>False</Private>
66 </Reference>
67 <Reference Include="System.Xml" >
68 <HintPath>System.Xml.dll</HintPath>
69 <Private>False</Private>
70 </Reference>
71 <Reference Include="System" >
72 <HintPath>System.dll</HintPath>
73 <Private>False</Private>
74 </Reference>
75 </ItemGroup>
76 <ItemGroup>
66 </ItemGroup> 77 </ItemGroup>
67 <ItemGroup> 78 <ItemGroup>
68 <EmbeddedResource Include="App.ico"> 79 <EmbeddedResource Include="App.ico">
@@ -184,11 +195,6 @@
184 <SubType>Code</SubType> 195 <SubType>Code</SubType>
185 </Compile> 196 </Compile>
186 </ItemGroup> 197 </ItemGroup>
187 <ItemGroup>
188 <Reference Include="System" />
189 <Reference Include="System.EnterpriseServices" />
190 <Reference Include="System.XML" />
191 </ItemGroup>
192 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> 198 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
193 <PropertyGroup> 199 <PropertyGroup>
194 <PreBuildEvent> 200 <PreBuildEvent>
@@ -196,4 +202,4 @@
196 <PostBuildEvent> 202 <PostBuildEvent>
197 </PostBuildEvent> 203 </PostBuildEvent>
198 </PropertyGroup> 204 </PropertyGroup>
199</Project> \ No newline at end of file 205</Project>
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build
index fda34b9..43f5516 100644
--- a/Prebuild/src/Prebuild.exe.build
+++ b/Prebuild/src/Prebuild.exe.build
@@ -62,9 +62,9 @@
62 <include name="System.dll" /> 62 <include name="System.dll" />
63 </references> 63 </references>
64 </csc> 64 </csc>
65 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> 65 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
66 <mkdir dir="${project::get-base-directory()}/../bin/"/> 66 <mkdir dir="${project::get-base-directory()}/../../bin/"/>
67 <copy todir="${project::get-base-directory()}/../bin/"> 67 <copy todir="${project::get-base-directory()}/../../bin/">
68 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 68 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
69 <include name="*.dll"/> 69 <include name="*.dll"/>
70 <include name="*.exe"/> 70 <include name="*.exe"/>
diff --git a/README.txt b/README.txt
index c7c5a93..da62bc7 100644
--- a/README.txt
+++ b/README.txt
@@ -42,9 +42,9 @@ To build it with nant :
42* cd to /Prebuild/ 42* cd to /Prebuild/
43* type 'nant' 43* type 'nant'
44 44
45After you've built it, move it from /Prebuild/src/bin to /bin/ directory, 45After you've built it, it will land in the root /bin/ directory,
46 46
47after that you just modify the prebuild.xml and then execute 47When adding or changing projects, modify the prebuild.xml and then execute
48 48
49bin/Prebuild.exe /target {target} 49bin/Prebuild.exe /target {target}
50 50
@@ -52,4 +52,5 @@ where target is either
52vs2005 - to generate new vs2005 solutions and projects 52vs2005 - to generate new vs2005 solutions and projects
53nant - to generate new nant build scripts 53nant - to generate new nant build scripts
54 54
55Remember to run prebuild whenever you've added or removed files as well.
55 56
diff --git a/prebuild.xml b/prebuild.xml
index 2ac874f..df02b59 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -214,8 +214,7 @@
214 </Files> 214 </Files>
215 </Project> 215 </Project>
216 216
217 <!-- OpenSim app --> 217 <Project name="OpenSim.RegionServer" path="OpenSim.RegionServer" type="Library">
218 <Project name="OpenSim" path="OpenSim.RegionServer" type="Exe">
219 <Configuration name="Debug"> 218 <Configuration name="Debug">
220 <Options> 219 <Options>
221 <OutputPath>../bin/</OutputPath> 220 <OutputPath>../bin/</OutputPath>
@@ -242,6 +241,35 @@
242 </Files> 241 </Files>
243 </Project> 242 </Project>
244 243
244 <!-- OpenSim app -->
245 <Project name="OpenSim" path="OpenSim" type="Exe">
246 <Configuration name="Debug">
247 <Options>
248 <OutputPath>../bin/</OutputPath>
249 </Options>
250 </Configuration>
251 <Configuration name="Release">
252 <Options>
253 <OutputPath>../bin/</OutputPath>
254 </Options>
255 </Configuration>
256
257 <ReferencePath>../bin/</ReferencePath>
258 <Reference name="System" localCopy="false"/>
259 <Reference name="System.Xml"/>
260 <Reference name="libsecondlife.dll"/>
261 <Reference name="Axiom.MathLib.dll"/>
262 <Reference name="Db4objects.Db4o.dll"/>
263 <Reference name="OpenSim.Framework"/>
264 <Reference name="OpenSim.Framework.Console"/>
265 <Reference name="OpenSim.Physics.Manager"/>
266 <Reference name="OpenSim.RegionServer"/>
267
268 <Files>
269 <Match pattern="*.cs" recurse="true"/>
270 </Files>
271 </Project>
272
245 <!-- Storage Plug-ins --> 273 <!-- Storage Plug-ins -->
246 <Project name="OpenSim.Storage.LocalStorageDb4o" path="OpenSim.Storage/LocalStorageDb4o" type="Library"> 274 <Project name="OpenSim.Storage.LocalStorageDb4o" path="OpenSim.Storage/LocalStorageDb4o" type="Library">
247 <Configuration name="Debug"> 275 <Configuration name="Debug">
@@ -277,7 +305,7 @@
277 305
278 306
279 <!-- Prebuild tool --> 307 <!-- Prebuild tool -->
280 <!-- Solution name="Prebuild" path="./Prebuild/" > 308 <Solution name="Prebuild" path="./Prebuild/" >
281 <Configuration name="Debug"> 309 <Configuration name="Debug">
282 <Options> 310 <Options>
283 <CompilerDefines>DEBUG;TRACE</CompilerDefines> 311 <CompilerDefines>DEBUG;TRACE</CompilerDefines>
@@ -305,7 +333,7 @@
305 <Options> 333 <Options>
306 <CompilerDefines>DEBUG;TRACE</CompilerDefines> 334 <CompilerDefines>DEBUG;TRACE</CompilerDefines>
307 <OptimizeCode>false</OptimizeCode> 335 <OptimizeCode>false</OptimizeCode>
308 <OutputPath>..\bin\</OutputPath> 336 <OutputPath>..\..\bin\</OutputPath>
309 <DebugInformation>true</DebugInformation> 337 <DebugInformation>true</DebugInformation>
310 <KeyFile>Prebuild.snk</KeyFile> 338 <KeyFile>Prebuild.snk</KeyFile>
311 <SuppressWarnings>1595</SuppressWarnings> 339 <SuppressWarnings>1595</SuppressWarnings>
@@ -314,13 +342,14 @@
314 <Configuration name="Release"> 342 <Configuration name="Release">
315 <Options> 343 <Options>
316 <CompilerDefines>TRACE</CompilerDefines> 344 <CompilerDefines>TRACE</CompilerDefines>
317 <OutputPath>..\bin\</OutputPath> 345 <OutputPath>..\..\bin\</OutputPath>
318 <OptimizeCode>true</OptimizeCode> 346 <OptimizeCode>true</OptimizeCode>
319 <DebugInformation>false</DebugInformation> 347 <DebugInformation>false</DebugInformation>
320 <KeyFile>Prebuild.snk</KeyFile> 348 <KeyFile>Prebuild.snk</KeyFile>
321 <SuppressWarnings>1595</SuppressWarnings> 349 <SuppressWarnings>1595</SuppressWarnings>
322 </Options> 350 </Options>
323 </Configuration> 351 </Configuration>
352 <ReferencePath>../bin/</ReferencePath>
324 <Reference name="System.EnterpriseServices" /> 353 <Reference name="System.EnterpriseServices" />
325 <Reference name="System.Xml" /> 354 <Reference name="System.Xml" />
326 <Reference name="System" /> 355 <Reference name="System" />
@@ -330,7 +359,7 @@
330 <Match pattern="*.cs" recurse="true"/> 359 <Match pattern="*.cs" recurse="true"/>
331 </Files> 360 </Files>
332 </Project> 361 </Project>
333 </Solution --> 362 </Solution>
334</Prebuild> 363</Prebuild>
335 364
336 365
generated by cgit v1.1 at 2024-11-11 20:13:39 +0000