diff options
author | mingchen | 2007-06-27 17:20:45 +0000 |
---|---|---|
committer | mingchen | 2007-06-27 17:20:45 +0000 |
commit | 1dcc814b703771c4dd96592b73727db2b54028a3 (patch) | |
tree | 380bcc29a9bb5d476804614d99e1a8c2e35dbcbd | |
parent | *Updated prebuild.xml and ran prebuild again (diff) | |
download | opensim-SC-1dcc814b703771c4dd96592b73727db2b54028a3.zip opensim-SC-1dcc814b703771c4dd96592b73727db2b54028a3.tar.gz opensim-SC-1dcc814b703771c4dd96592b73727db2b54028a3.tar.bz2 opensim-SC-1dcc814b703771c4dd96592b73727db2b54028a3.tar.xz |
*More compile fixes (should be it on OpenSim.sln)
-rw-r--r-- | OpenSim.sln | 12 | ||||
-rw-r--r-- | OpenSim/Framework/General/OpenSim.Framework.csproj | 4 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSim.csproj | 12 | ||||
-rw-r--r-- | OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj | 6 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj | 6 | ||||
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj | 12 | ||||
-rw-r--r-- | OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj | 87 | ||||
-rw-r--r-- | prebuild.xml | 6 |
8 files changed, 69 insertions, 76 deletions
diff --git a/OpenSim.sln b/OpenSim.sln index ac2cefc..746cd3d 100644 --- a/OpenSim.sln +++ b/OpenSim.sln | |||
@@ -26,6 +26,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communicatio | |||
26 | EndProject | 26 | EndProject |
27 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communications.OGS1", "OpenSim\Region\Communications\OGS1\OpenSim.Region.Communications.OGS1.csproj", "{4806E378-0000-0000-0000-000000000000}" | 27 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Communications.OGS1", "OpenSim\Region\Communications\OGS1\OpenSim.Region.Communications.OGS1.csproj", "{4806E378-0000-0000-0000-000000000000}" |
28 | EndProject | 28 | EndProject |
29 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Environment", "OpenSim\Region\Simulation\OpenSim.Region.Environment.csproj", "{DCBA491C-0000-0000-0000-000000000000}" | ||
30 | EndProject | ||
29 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.GridInterfaces.Local", "OpenSim\Region\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj", "{241A8CDD-0000-0000-0000-000000000000}" | 31 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.GridInterfaces.Local", "OpenSim\Region\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj", "{241A8CDD-0000-0000-0000-000000000000}" |
30 | EndProject | 32 | EndProject |
31 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.GridInterfaces.Remote", "OpenSim\Region\GridInterfaces\Remote\OpenSim.Region.GridInterfaces.Remote.csproj", "{98C7B681-0000-0000-0000-000000000000}" | 33 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.GridInterfaces.Remote", "OpenSim\Region\GridInterfaces\Remote\OpenSim.Region.GridInterfaces.Remote.csproj", "{98C7B681-0000-0000-0000-000000000000}" |
@@ -38,8 +40,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.OdeP | |||
38 | EndProject | 40 | EndProject |
39 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.PhysXPlugin", "OpenSim\Region\Physics\PhysXPlugin\OpenSim.Region.Physics.PhysXPlugin.csproj", "{A6D191D8-0000-0000-0000-000000000000}" | 41 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Physics.PhysXPlugin", "OpenSim\Region\Physics\PhysXPlugin\OpenSim.Region.Physics.PhysXPlugin.csproj", "{A6D191D8-0000-0000-0000-000000000000}" |
40 | EndProject | 42 | EndProject |
41 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Simulation", "OpenSim\Region\Simulation\OpenSim.Region.Simulation.csproj", "{C0DAB338-0000-0000-0000-000000000000}" | ||
42 | EndProject | ||
43 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Storage.LocalStorageBerkeleyDB", "OpenSim\Region\Storage\LocalStorageBerkeleyDB\OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj", "{A4691E59-0000-0000-0000-000000000000}" | 43 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Storage.LocalStorageBerkeleyDB", "OpenSim\Region\Storage\LocalStorageBerkeleyDB\OpenSim.Region.Storage.LocalStorageBerkeleyDB.csproj", "{A4691E59-0000-0000-0000-000000000000}" |
44 | EndProject | 44 | EndProject |
45 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Storage.LocalStorageDb4o", "OpenSim\Region\Storage\LocalStorageDb4o\OpenSim.Region.Storage.LocalStorageDb4o.csproj", "{43DB702D-0000-0000-0000-000000000000}" | 45 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Region.Storage.LocalStorageDb4o", "OpenSim\Region\Storage\LocalStorageDb4o\OpenSim.Region.Storage.LocalStorageDb4o.csproj", "{43DB702D-0000-0000-0000-000000000000}" |
@@ -108,6 +108,10 @@ Global | |||
108 | {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 108 | {4806E378-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
109 | {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 109 | {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
110 | {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 110 | {4806E378-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
111 | {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
112 | {DCBA491C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
113 | {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
114 | {DCBA491C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
111 | {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 115 | {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
112 | {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 116 | {241A8CDD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
113 | {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 117 | {241A8CDD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
@@ -132,10 +136,6 @@ Global | |||
132 | {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 136 | {A6D191D8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
133 | {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 137 | {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
134 | {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 138 | {A6D191D8-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
135 | {C0DAB338-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
136 | {C0DAB338-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
137 | {C0DAB338-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
138 | {C0DAB338-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
139 | {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 139 | {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
140 | {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 140 | {A4691E59-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
141 | {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 141 | {A4691E59-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj index 7f71949..3e77f1e 100644 --- a/OpenSim/Framework/General/OpenSim.Framework.csproj +++ b/OpenSim/Framework/General/OpenSim.Framework.csproj | |||
@@ -91,10 +91,10 @@ | |||
91 | <Compile Include="AgentInventory.cs"> | 91 | <Compile Include="AgentInventory.cs"> |
92 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
93 | </Compile> | 93 | </Compile> |
94 | <Compile Include="AuthenticateSessionBase.cs"> | 94 | <Compile Include="Util.cs"> |
95 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
96 | </Compile> | 96 | </Compile> |
97 | <Compile Include="Util.cs"> | 97 | <Compile Include="AuthenticateSessionBase.cs"> |
98 | <SubType>Code</SubType> | 98 | <SubType>Code</SubType> |
99 | </Compile> | 99 | </Compile> |
100 | <Compile Include="Logger.cs"> | 100 | <Compile Include="Logger.cs"> |
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj index d5730a4..8e50e92 100644 --- a/OpenSim/Region/Application/OpenSim.csproj +++ b/OpenSim/Region/Application/OpenSim.csproj | |||
@@ -144,15 +144,15 @@ | |||
144 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 144 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
145 | <Private>False</Private> | 145 | <Private>False</Private> |
146 | </ProjectReference> | 146 | </ProjectReference> |
147 | <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj"> | 147 | <ProjectReference Include="..\Simulation\OpenSim.Region.Environment.csproj"> |
148 | <Name>OpenSim.Region.Physics.Manager</Name> | 148 | <Name>OpenSim.Region.Environment</Name> |
149 | <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project> | 149 | <Project>{DCBA491C-0000-0000-0000-000000000000}</Project> |
150 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 150 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
151 | <Private>False</Private> | 151 | <Private>False</Private> |
152 | </ProjectReference> | 152 | </ProjectReference> |
153 | <ProjectReference Include="..\Simulation\OpenSim.Region.Simulation.csproj"> | 153 | <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj"> |
154 | <Name>OpenSim.Region.Simulation</Name> | 154 | <Name>OpenSim.Region.Physics.Manager</Name> |
155 | <Project>{C0DAB338-0000-0000-0000-000000000000}</Project> | 155 | <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project> |
156 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 156 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
157 | <Private>False</Private> | 157 | <Private>False</Private> |
158 | </ProjectReference> | 158 | </ProjectReference> |
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj index 0a15a49..f9f6b7d 100644 --- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj +++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj | |||
@@ -98,13 +98,13 @@ | |||
98 | </ProjectReference> | 98 | </ProjectReference> |
99 | </ItemGroup> | 99 | </ItemGroup> |
100 | <ItemGroup> | 100 | <ItemGroup> |
101 | <Compile Include="CommunicationsLocal.cs"> | 101 | <Compile Include="LocalUserServices.cs"> |
102 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
103 | </Compile> | 103 | </Compile> |
104 | <Compile Include="LocalBackEndServices.cs"> | 104 | <Compile Include="CommunicationsLocal.cs"> |
105 | <SubType>Code</SubType> | 105 | <SubType>Code</SubType> |
106 | </Compile> | 106 | </Compile> |
107 | <Compile Include="LocalUserServices.cs"> | 107 | <Compile Include="LocalBackEndServices.cs"> |
108 | <SubType>Code</SubType> | 108 | <SubType>Code</SubType> |
109 | </Compile> | 109 | </Compile> |
110 | <Compile Include="Properties\AssemblyInfo.cs"> | 110 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj index 8cc5641..1aa7019 100644 --- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj +++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj | |||
@@ -116,16 +116,16 @@ | |||
116 | </ProjectReference> | 116 | </ProjectReference> |
117 | </ItemGroup> | 117 | </ItemGroup> |
118 | <ItemGroup> | 118 | <ItemGroup> |
119 | <Compile Include="GridCommsManager.cs"> | 119 | <Compile Include="OGSUserServices.cs"> |
120 | <SubType>Code</SubType> | 120 | <SubType>Code</SubType> |
121 | </Compile> | 121 | </Compile> |
122 | <Compile Include="OGS1GridServices.cs"> | 122 | <Compile Include="GridCommsManager.cs"> |
123 | <SubType>Code</SubType> | 123 | <SubType>Code</SubType> |
124 | </Compile> | 124 | </Compile> |
125 | <Compile Include="OGSInterSimComms.cs"> | 125 | <Compile Include="OGSInterSimComms.cs"> |
126 | <SubType>Code</SubType> | 126 | <SubType>Code</SubType> |
127 | </Compile> | 127 | </Compile> |
128 | <Compile Include="OGSUserServices.cs"> | 128 | <Compile Include="OGS1GridServices.cs"> |
129 | <SubType>Code</SubType> | 129 | <SubType>Code</SubType> |
130 | </Compile> | 130 | </Compile> |
131 | <Compile Include="Properties\AssemblyInfo.cs"> | 131 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj index 03805ae..2eb5ac0 100644 --- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj +++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj | |||
@@ -122,15 +122,15 @@ | |||
122 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 122 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
123 | <Private>False</Private> | 123 | <Private>False</Private> |
124 | </ProjectReference> | 124 | </ProjectReference> |
125 | <ProjectReference Include="..\..\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj"> | 125 | <ProjectReference Include="..\..\Simulation\OpenSim.Region.Environment.csproj"> |
126 | <Name>OpenSim.Region.GridInterfaces.Local</Name> | 126 | <Name>OpenSim.Region.Environment</Name> |
127 | <Project>{241A8CDD-0000-0000-0000-000000000000}</Project> | 127 | <Project>{DCBA491C-0000-0000-0000-000000000000}</Project> |
128 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 128 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
129 | <Private>False</Private> | 129 | <Private>False</Private> |
130 | </ProjectReference> | 130 | </ProjectReference> |
131 | <ProjectReference Include="..\..\Simulation\OpenSim.Region.Simulation.csproj"> | 131 | <ProjectReference Include="..\..\GridInterfaces\Local\OpenSim.Region.GridInterfaces.Local.csproj"> |
132 | <Name>OpenSim.Region.Simulation</Name> | 132 | <Name>OpenSim.Region.GridInterfaces.Local</Name> |
133 | <Project>{C0DAB338-0000-0000-0000-000000000000}</Project> | 133 | <Project>{241A8CDD-0000-0000-0000-000000000000}</Project> |
134 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 134 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
135 | <Private>False</Private> | 135 | <Private>False</Private> |
136 | </ProjectReference> | 136 | </ProjectReference> |
diff --git a/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj b/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj index 0597857..60305bd 100644 --- a/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj +++ b/OpenSim/Region/Simulation/OpenSim.Region.Environment.csproj | |||
@@ -1,13 +1,12 @@ | |||
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>{C0DAB338-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{DCBA491C-0000-0000-0000-000000000000}</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.Region.Environment</AssemblyName> | 12 | <AssemblyName>OpenSim.Region.Environment</AssemblyName> |
@@ -16,11 +15,9 @@ | |||
16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
17 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
18 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
19 | <AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
20 | </AppDesignerFolder> | ||
21 | <RootNamespace>OpenSim.Region.Environment</RootNamespace> | 19 | <RootNamespace>OpenSim.Region.Environment</RootNamespace> |
22 | <StartupObject> | 20 | <StartupObject></StartupObject> |
23 | </StartupObject> | ||
24 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
25 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
26 | </PropertyGroup> | 23 | </PropertyGroup> |
@@ -31,8 +28,7 @@ | |||
31 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
32 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
33 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
34 | <DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
35 | </DocumentationFile> | ||
36 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
37 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
38 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
@@ -41,8 +37,7 @@ | |||
41 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
42 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
43 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
44 | <NoWarn> | 40 | <NoWarn></NoWarn> |
45 | </NoWarn> | ||
46 | </PropertyGroup> | 41 | </PropertyGroup> |
47 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
48 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
@@ -51,8 +46,7 @@ | |||
51 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
52 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
53 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE</DefineConstants> |
54 | <DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
55 | </DocumentationFile> | ||
56 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
57 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
58 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
@@ -61,31 +55,30 @@ | |||
61 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
62 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
63 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
64 | <NoWarn> | 58 | <NoWarn></NoWarn> |
65 | </NoWarn> | ||
66 | </PropertyGroup> | 59 | </PropertyGroup> |
67 | <ItemGroup> | 60 | <ItemGroup> |
68 | <Reference Include="Axiom.MathLib.dll"> | 61 | <Reference Include="Axiom.MathLib.dll" > |
69 | <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath> | 62 | <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath> |
70 | <Private>False</Private> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
72 | <Reference Include="Db4objects.Db4o.dll"> | 65 | <Reference Include="Db4objects.Db4o.dll" > |
73 | <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath> | 66 | <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath> |
74 | <Private>False</Private> | 67 | <Private>False</Private> |
75 | </Reference> | 68 | </Reference> |
76 | <Reference Include="libsecondlife.dll"> | 69 | <Reference Include="libsecondlife.dll" > |
77 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | 70 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> |
78 | <Private>False</Private> | 71 | <Private>False</Private> |
79 | </Reference> | 72 | </Reference> |
80 | <Reference Include="System"> | 73 | <Reference Include="System" > |
81 | <HintPath>System.dll</HintPath> | 74 | <HintPath>System.dll</HintPath> |
82 | <Private>False</Private> | 75 | <Private>False</Private> |
83 | </Reference> | 76 | </Reference> |
84 | <Reference Include="System.Xml"> | 77 | <Reference Include="System.Xml" > |
85 | <HintPath>System.Xml.dll</HintPath> | 78 | <HintPath>System.Xml.dll</HintPath> |
86 | <Private>False</Private> | 79 | <Private>False</Private> |
87 | </Reference> | 80 | </Reference> |
88 | <Reference Include="XMLRPC.dll"> | 81 | <Reference Include="XMLRPC.dll" > |
89 | <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> | 82 | <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> |
90 | <Private>False</Private> | 83 | <Private>False</Private> |
91 | </Reference> | 84 | </Reference> |
@@ -95,53 +88,53 @@ | |||
95 | <Name>OpenSim.Framework</Name> | 88 | <Name>OpenSim.Framework</Name> |
96 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 89 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
97 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 90 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
98 | <Private>False</Private> | 91 | <Private>False</Private> |
99 | </ProjectReference> | 92 | </ProjectReference> |
100 | <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj"> | 93 | <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj"> |
101 | <Name>OpenSim.Framework.Communications</Name> | 94 | <Name>OpenSim.Framework.Communications</Name> |
102 | <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project> | 95 | <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project> |
103 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 96 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
104 | <Private>False</Private> | 97 | <Private>False</Private> |
105 | </ProjectReference> | 98 | </ProjectReference> |
106 | <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj"> | 99 | <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj"> |
107 | <Name>OpenSim.Framework.Console</Name> | 100 | <Name>OpenSim.Framework.Console</Name> |
108 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 101 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> |
109 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 102 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
110 | <Private>False</Private> | 103 | <Private>False</Private> |
111 | </ProjectReference> | 104 | </ProjectReference> |
112 | <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj"> | 105 | <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj"> |
113 | <Name>OpenSim.Framework.GenericConfig.Xml</Name> | 106 | <Name>OpenSim.Framework.GenericConfig.Xml</Name> |
114 | <Project>{C74E4A30-0000-0000-0000-000000000000}</Project> | 107 | <Project>{C74E4A30-0000-0000-0000-000000000000}</Project> |
115 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 108 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
116 | <Private>False</Private> | 109 | <Private>False</Private> |
117 | </ProjectReference> | 110 | </ProjectReference> |
118 | <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj"> | 111 | <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj"> |
119 | <Name>OpenSim.Framework.Servers</Name> | 112 | <Name>OpenSim.Framework.Servers</Name> |
120 | <Project>{2CC71860-0000-0000-0000-000000000000}</Project> | 113 | <Project>{2CC71860-0000-0000-0000-000000000000}</Project> |
121 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 114 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
122 | <Private>False</Private> | 115 | <Private>False</Private> |
123 | </ProjectReference> | 116 | </ProjectReference> |
124 | <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj"> | 117 | <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj"> |
125 | <Name>OpenSim.Region.Caches</Name> | 118 | <Name>OpenSim.Region.Caches</Name> |
126 | <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project> | 119 | <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project> |
127 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 120 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
128 | <Private>False</Private> | 121 | <Private>False</Private> |
129 | </ProjectReference> | 122 | </ProjectReference> |
130 | <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj"> | 123 | <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj"> |
131 | <Name>OpenSim.Region.Physics.Manager</Name> | 124 | <Name>OpenSim.Region.Physics.Manager</Name> |
132 | <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project> | 125 | <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project> |
133 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 126 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
134 | <Private>False</Private> | 127 | <Private>False</Private> |
135 | </ProjectReference> | 128 | </ProjectReference> |
136 | <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj"> | 129 | <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj"> |
137 | <Name>OpenSim.Region.Terrain.BasicTerrain</Name> | 130 | <Name>OpenSim.Region.Terrain.BasicTerrain</Name> |
138 | <Project>{C9E0F891-0000-0000-0000-000000000000}</Project> | 131 | <Project>{C9E0F891-0000-0000-0000-000000000000}</Project> |
139 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 132 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
140 | <Private>False</Private> | 133 | <Private>False</Private> |
141 | </ProjectReference> | 134 | </ProjectReference> |
142 | </ItemGroup> | 135 | </ItemGroup> |
143 | <ItemGroup> | 136 | <ItemGroup> |
144 | <Compile Include="Caps.cs"> | 137 | <Compile Include="RegionManager.cs"> |
145 | <SubType>Code</SubType> | 138 | <SubType>Code</SubType> |
146 | </Compile> | 139 | </Compile> |
147 | <Compile Include="EstateManager.cs"> | 140 | <Compile Include="EstateManager.cs"> |
@@ -150,58 +143,58 @@ | |||
150 | <Compile Include="ParcelManager.cs"> | 143 | <Compile Include="ParcelManager.cs"> |
151 | <SubType>Code</SubType> | 144 | <SubType>Code</SubType> |
152 | </Compile> | 145 | </Compile> |
153 | <Compile Include="RegionManager.cs"> | 146 | <Compile Include="Caps.cs"> |
154 | <SubType>Code</SubType> | 147 | <SubType>Code</SubType> |
155 | </Compile> | 148 | </Compile> |
156 | <Compile Include="Scenes\Entity.cs"> | 149 | <Compile Include="Scenes\Entity.cs"> |
157 | <SubType>Code</SubType> | 150 | <SubType>Code</SubType> |
158 | </Compile> | 151 | </Compile> |
159 | <Compile Include="Scenes\IScenePresenceBody.cs"> | 152 | <Compile Include="Scenes\Scene.cs"> |
160 | <SubType>Code</SubType> | 153 | <SubType>Code</SubType> |
161 | </Compile> | 154 | </Compile> |
162 | <Compile Include="Scenes\Primitive.cs"> | 155 | <Compile Include="Scenes\Scene.Scripting.cs"> |
163 | <SubType>Code</SubType> | 156 | <SubType>Code</SubType> |
164 | </Compile> | 157 | </Compile> |
165 | <Compile Include="Scenes\Scene.cs"> | 158 | <Compile Include="Scenes\ScenePresence.Body.cs"> |
166 | <SubType>Code</SubType> | 159 | <SubType>Code</SubType> |
167 | </Compile> | 160 | </Compile> |
168 | <Compile Include="Scenes\Scene.PacketHandlers.cs"> | 161 | <Compile Include="Scenes\SceneEvents.cs"> |
169 | <SubType>Code</SubType> | 162 | <SubType>Code</SubType> |
170 | </Compile> | 163 | </Compile> |
171 | <Compile Include="Scenes\Scene.Scripting.cs"> | 164 | <Compile Include="Scenes\ScenePresence.cs"> |
172 | <SubType>Code</SubType> | 165 | <SubType>Code</SubType> |
173 | </Compile> | 166 | </Compile> |
174 | <Compile Include="Scenes\SceneBase.cs"> | 167 | <Compile Include="Scenes\ScenePresence.Animations.cs"> |
175 | <SubType>Code</SubType> | 168 | <SubType>Code</SubType> |
176 | </Compile> | 169 | </Compile> |
177 | <Compile Include="Scenes\SceneEvents.cs"> | 170 | <Compile Include="Scenes\Scene.PacketHandlers.cs"> |
178 | <SubType>Code</SubType> | 171 | <SubType>Code</SubType> |
179 | </Compile> | 172 | </Compile> |
180 | <Compile Include="Scenes\SceneObject.cs"> | 173 | <Compile Include="Scenes\SceneObject.cs"> |
181 | <SubType>Code</SubType> | 174 | <SubType>Code</SubType> |
182 | </Compile> | 175 | </Compile> |
183 | <Compile Include="Scenes\ScenePresence.Animations.cs"> | 176 | <Compile Include="Scenes\Primitive.cs"> |
184 | <SubType>Code</SubType> | 177 | <SubType>Code</SubType> |
185 | </Compile> | 178 | </Compile> |
186 | <Compile Include="Scenes\ScenePresence.Body.cs"> | 179 | <Compile Include="Scenes\SceneBase.cs"> |
187 | <SubType>Code</SubType> | 180 | <SubType>Code</SubType> |
188 | </Compile> | 181 | </Compile> |
189 | <Compile Include="Scenes\ScenePresence.cs"> | 182 | <Compile Include="Scenes\IScenePresenceBody.cs"> |
190 | <SubType>Code</SubType> | 183 | <SubType>Code</SubType> |
191 | </Compile> | 184 | </Compile> |
192 | <Compile Include="Scenes\scripting\IScriptContext.cs"> | 185 | <Compile Include="Scenes\scripting\IScriptHandler.cs"> |
193 | <SubType>Code</SubType> | 186 | <SubType>Code</SubType> |
194 | </Compile> | 187 | </Compile> |
195 | <Compile Include="Scenes\scripting\IScriptEntity.cs"> | 188 | <Compile Include="Scenes\scripting\ScriptFactory.cs"> |
196 | <SubType>Code</SubType> | 189 | <SubType>Code</SubType> |
197 | </Compile> | 190 | </Compile> |
198 | <Compile Include="Scenes\scripting\IScriptHandler.cs"> | 191 | <Compile Include="Scenes\scripting\IScriptContext.cs"> |
199 | <SubType>Code</SubType> | 192 | <SubType>Code</SubType> |
200 | </Compile> | 193 | </Compile> |
201 | <Compile Include="Scenes\scripting\Script.cs"> | 194 | <Compile Include="Scenes\scripting\Script.cs"> |
202 | <SubType>Code</SubType> | 195 | <SubType>Code</SubType> |
203 | </Compile> | 196 | </Compile> |
204 | <Compile Include="Scenes\scripting\ScriptFactory.cs"> | 197 | <Compile Include="Scenes\scripting\IScriptEntity.cs"> |
205 | <SubType>Code</SubType> | 198 | <SubType>Code</SubType> |
206 | </Compile> | 199 | </Compile> |
207 | <Compile Include="Scenes\scripting\Scripts\FollowRandomAvatar.cs"> | 200 | <Compile Include="Scenes\scripting\Scripts\FollowRandomAvatar.cs"> |
@@ -215,4 +208,4 @@ | |||
215 | <PostBuildEvent> | 208 | <PostBuildEvent> |
216 | </PostBuildEvent> | 209 | </PostBuildEvent> |
217 | </PropertyGroup> | 210 | </PropertyGroup> |
218 | </Project> \ No newline at end of file | 211 | </Project> |
diff --git a/prebuild.xml b/prebuild.xml index efd114d..2488587 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -584,7 +584,7 @@ | |||
584 | 584 | ||
585 | 585 | ||
586 | 586 | ||
587 | <Project name="OpenSim.Region.Simulation" path="OpenSim/Region/Simulation" type="Library"> | 587 | <Project name="OpenSim.Region.Environment" path="OpenSim/Region/Simulation" type="Library"> |
588 | <Configuration name="Debug"> | 588 | <Configuration name="Debug"> |
589 | <Options> | 589 | <Options> |
590 | <OutputPath>../../../bin/</OutputPath> | 590 | <OutputPath>../../../bin/</OutputPath> |
@@ -641,7 +641,7 @@ | |||
641 | <Reference name="OpenSim.Framework.Console"/> | 641 | <Reference name="OpenSim.Framework.Console"/> |
642 | <Reference name="OpenSim.Region.Physics.Manager"/> | 642 | <Reference name="OpenSim.Region.Physics.Manager"/> |
643 | <Reference name="OpenSim.Framework.Servers"/> | 643 | <Reference name="OpenSim.Framework.Servers"/> |
644 | <Reference name="OpenSim.Region.Simulation"/> | 644 | <Reference name="OpenSim.Region.Environment"/> |
645 | <Reference name="OpenSim.Region.ClientStack"/> | 645 | <Reference name="OpenSim.Region.ClientStack"/> |
646 | <Reference name="OpenSim.Framework.GenericConfig.Xml"/> | 646 | <Reference name="OpenSim.Framework.GenericConfig.Xml"/> |
647 | <Reference name="OpenSim.Framework.Communications"/> | 647 | <Reference name="OpenSim.Framework.Communications"/> |
@@ -686,7 +686,7 @@ | |||
686 | <Reference name="OpenSim.Region.Communications.Local"/> | 686 | <Reference name="OpenSim.Region.Communications.Local"/> |
687 | <Reference name="OpenSim.Region.Caches"/> | 687 | <Reference name="OpenSim.Region.Caches"/> |
688 | <Reference name="OpenSim.Region.ClientStack"/> | 688 | <Reference name="OpenSim.Region.ClientStack"/> |
689 | <Reference name="OpenSim.Region.Simulation"/> | 689 | <Reference name="OpenSim.Region.Environment"/> |
690 | 690 | ||
691 | 691 | ||
692 | <Files> | 692 | <Files> |