diff options
author | mingchen | 2007-06-11 18:27:07 +0000 |
---|---|---|
committer | mingchen | 2007-06-11 18:27:07 +0000 |
commit | 5c3a4f52f4b4413832a6942aa75a21b157cd48dc (patch) | |
tree | 365f721039c08ecbc57e82dfa24d6f07b6419c25 /OpenSim | |
parent | *Removed OSVector3 and replaced with libsecondlife.LLVector3 (diff) | |
download | opensim-SC_OLD-5c3a4f52f4b4413832a6942aa75a21b157cd48dc.zip opensim-SC_OLD-5c3a4f52f4b4413832a6942aa75a21b157cd48dc.tar.gz opensim-SC_OLD-5c3a4f52f4b4413832a6942aa75a21b157cd48dc.tar.bz2 opensim-SC_OLD-5c3a4f52f4b4413832a6942aa75a21b157cd48dc.tar.xz |
*Removed SimProfileBase from OpenSim (Unused/Depreciated)
*Updated prebuild.xml
Diffstat (limited to '')
8 files changed, 63 insertions, 77 deletions
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj index 5c30810..365af66 100644 --- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj +++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj | |||
@@ -136,6 +136,9 @@ | |||
136 | <Compile Include="Estate\EstateManager.cs"> | 136 | <Compile Include="Estate\EstateManager.cs"> |
137 | <SubType>Code</SubType> | 137 | <SubType>Code</SubType> |
138 | </Compile> | 138 | </Compile> |
139 | <Compile Include="World\AvatarAnimations.cs"> | ||
140 | <SubType>Code</SubType> | ||
141 | </Compile> | ||
139 | <Compile Include="World\Avatar.Client.cs"> | 142 | <Compile Include="World\Avatar.Client.cs"> |
140 | <SubType>Code</SubType> | 143 | <SubType>Code</SubType> |
141 | </Compile> | 144 | </Compile> |
@@ -145,9 +148,6 @@ | |||
145 | <Compile Include="World\Avatar.Update.cs"> | 148 | <Compile Include="World\Avatar.Update.cs"> |
146 | <SubType>Code</SubType> | 149 | <SubType>Code</SubType> |
147 | </Compile> | 150 | </Compile> |
148 | <Compile Include="World\AvatarAnimations.cs"> | ||
149 | <SubType>Code</SubType> | ||
150 | </Compile> | ||
151 | <Compile Include="World\Entity.cs"> | 151 | <Compile Include="World\Entity.cs"> |
152 | <SubType>Code</SubType> | 152 | <SubType>Code</SubType> |
153 | </Compile> | 153 | </Compile> |
@@ -163,10 +163,10 @@ | |||
163 | <Compile Include="World\World.PacketHandlers.cs"> | 163 | <Compile Include="World\World.PacketHandlers.cs"> |
164 | <SubType>Code</SubType> | 164 | <SubType>Code</SubType> |
165 | </Compile> | 165 | </Compile> |
166 | <Compile Include="World\World.Scripting.cs"> | 166 | <Compile Include="World\WorldBase.cs"> |
167 | <SubType>Code</SubType> | 167 | <SubType>Code</SubType> |
168 | </Compile> | 168 | </Compile> |
169 | <Compile Include="World\WorldBase.cs"> | 169 | <Compile Include="World\World.Scripting.cs"> |
170 | <SubType>Code</SubType> | 170 | <SubType>Code</SubType> |
171 | </Compile> | 171 | </Compile> |
172 | <Compile Include="World\scripting\IScriptContext.cs"> | 172 | <Compile Include="World\scripting\IScriptContext.cs"> |
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build index ae46c6b..a33d214 100644 --- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build +++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build | |||
@@ -13,17 +13,17 @@ | |||
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="ParcelManager.cs" /> | 14 | <include name="ParcelManager.cs" /> |
15 | <include name="Estate/EstateManager.cs" /> | 15 | <include name="Estate/EstateManager.cs" /> |
16 | <include name="World/AvatarAnimations.cs" /> | ||
16 | <include name="World/Avatar.Client.cs" /> | 17 | <include name="World/Avatar.Client.cs" /> |
17 | <include name="World/Avatar.cs" /> | 18 | <include name="World/Avatar.cs" /> |
18 | <include name="World/Avatar.Update.cs" /> | 19 | <include name="World/Avatar.Update.cs" /> |
19 | <include name="World/AvatarAnimations.cs" /> | ||
20 | <include name="World/Entity.cs" /> | 20 | <include name="World/Entity.cs" /> |
21 | <include name="World/Primitive.cs" /> | 21 | <include name="World/Primitive.cs" /> |
22 | <include name="World/SceneObject.cs" /> | 22 | <include name="World/SceneObject.cs" /> |
23 | <include name="World/World.cs" /> | 23 | <include name="World/World.cs" /> |
24 | <include name="World/World.PacketHandlers.cs" /> | 24 | <include name="World/World.PacketHandlers.cs" /> |
25 | <include name="World/World.Scripting.cs" /> | ||
26 | <include name="World/WorldBase.cs" /> | 25 | <include name="World/WorldBase.cs" /> |
26 | <include name="World/World.Scripting.cs" /> | ||
27 | <include name="World/scripting/IScriptContext.cs" /> | 27 | <include name="World/scripting/IScriptContext.cs" /> |
28 | <include name="World/scripting/IScriptEntity.cs" /> | 28 | <include name="World/scripting/IScriptEntity.cs" /> |
29 | <include name="World/scripting/IScriptHandler.cs" /> | 29 | <include name="World/scripting/IScriptHandler.cs" /> |
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 75b70b4..259d839 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj | |||
@@ -1,4 +1,4 @@ | |||
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> |
@@ -6,8 +6,7 @@ | |||
6 | <ProjectGuid>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{632E1BFD-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.RegionServer</AssemblyName> | 12 | <AssemblyName>OpenSim.RegionServer</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.RegionServer</RootNamespace> | 19 | <RootNamespace>OpenSim.RegionServer</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,27 +55,26 @@ | |||
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="System"> | 61 | <Reference Include="System" > |
69 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
70 | <Private>False</Private> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
72 | <Reference Include="System.Xml"> | 65 | <Reference Include="System.Xml" > |
73 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.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="Axiom.MathLib.dll"> | 73 | <Reference Include="Axiom.MathLib.dll" > |
81 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> | 74 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> |
82 | <Private>False</Private> | 75 | <Private>False</Private> |
83 | </Reference> | 76 | </Reference> |
84 | <Reference Include="Db4objects.Db4o.dll"> | 77 | <Reference Include="Db4objects.Db4o.dll" > |
85 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> | 78 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> |
86 | <Private>False</Private> | 79 | <Private>False</Private> |
87 | </Reference> | 80 | </Reference> |
@@ -91,43 +84,43 @@ | |||
91 | <Name>OpenSim.Terrain.BasicTerrain</Name> | 84 | <Name>OpenSim.Terrain.BasicTerrain</Name> |
92 | <Project>{2270B8FE-0000-0000-0000-000000000000}</Project> | 85 | <Project>{2270B8FE-0000-0000-0000-000000000000}</Project> |
93 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
94 | <Private>False</Private> | 87 | <Private>False</Private> |
95 | </ProjectReference> | 88 | </ProjectReference> |
96 | <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> | 89 | <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> |
97 | <Name>OpenSim.Framework</Name> | 90 | <Name>OpenSim.Framework</Name> |
98 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 91 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
99 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
100 | <Private>False</Private> | 93 | <Private>False</Private> |
101 | </ProjectReference> | 94 | </ProjectReference> |
102 | <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 95 | <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> |
103 | <Name>OpenSim.Framework.Console</Name> | 96 | <Name>OpenSim.Framework.Console</Name> |
104 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 97 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> |
105 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
106 | <Private>False</Private> | 99 | <Private>False</Private> |
107 | </ProjectReference> | 100 | </ProjectReference> |
108 | <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj"> | 101 | <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj"> |
109 | <Name>OpenSim.GenericConfig.Xml</Name> | 102 | <Name>OpenSim.GenericConfig.Xml</Name> |
110 | <Project>{E88EF749-0000-0000-0000-000000000000}</Project> | 103 | <Project>{E88EF749-0000-0000-0000-000000000000}</Project> |
111 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
112 | <Private>False</Private> | 105 | <Private>False</Private> |
113 | </ProjectReference> | 106 | </ProjectReference> |
114 | <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> | 107 | <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> |
115 | <Name>OpenSim.Physics.Manager</Name> | 108 | <Name>OpenSim.Physics.Manager</Name> |
116 | <Project>{8BE16150-0000-0000-0000-000000000000}</Project> | 109 | <Project>{8BE16150-0000-0000-0000-000000000000}</Project> |
117 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 110 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
118 | <Private>False</Private> | 111 | <Private>False</Private> |
119 | </ProjectReference> | 112 | </ProjectReference> |
120 | <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> | 113 | <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> |
121 | <Name>OpenSim.Servers</Name> | 114 | <Name>OpenSim.Servers</Name> |
122 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> | 115 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> |
123 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 116 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
124 | <Private>False</Private> | 117 | <Private>False</Private> |
125 | </ProjectReference> | 118 | </ProjectReference> |
126 | <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj"> | 119 | <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj"> |
127 | <Name>XMLRPC</Name> | 120 | <Name>XMLRPC</Name> |
128 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | 121 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> |
129 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 122 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
130 | <Private>False</Private> | 123 | <Private>False</Private> |
131 | </ProjectReference> | 124 | </ProjectReference> |
132 | </ItemGroup> | 125 | </ItemGroup> |
133 | <ItemGroup> | 126 | <ItemGroup> |
@@ -161,16 +154,16 @@ | |||
161 | <Compile Include="PacketServer.cs"> | 154 | <Compile Include="PacketServer.cs"> |
162 | <SubType>Code</SubType> | 155 | <SubType>Code</SubType> |
163 | </Compile> | 156 | </Compile> |
164 | <Compile Include="RegionServerBase.cs"> | 157 | <Compile Include="UserConfigUtility.cs"> |
165 | <SubType>Code</SubType> | 158 | <SubType>Code</SubType> |
166 | </Compile> | 159 | </Compile> |
167 | <Compile Include="UDPServer.cs"> | 160 | <Compile Include="VersionInfo.cs"> |
168 | <SubType>Code</SubType> | 161 | <SubType>Code</SubType> |
169 | </Compile> | 162 | </Compile> |
170 | <Compile Include="UserConfigUtility.cs"> | 163 | <Compile Include="RegionServerBase.cs"> |
171 | <SubType>Code</SubType> | 164 | <SubType>Code</SubType> |
172 | </Compile> | 165 | </Compile> |
173 | <Compile Include="VersionInfo.cs"> | 166 | <Compile Include="UDPServer.cs"> |
174 | <SubType>Code</SubType> | 167 | <SubType>Code</SubType> |
175 | </Compile> | 168 | </Compile> |
176 | <Compile Include="Assets\AssetCache.cs"> | 169 | <Compile Include="Assets\AssetCache.cs"> |
@@ -187,4 +180,4 @@ | |||
187 | <PostBuildEvent> | 180 | <PostBuildEvent> |
188 | </PostBuildEvent> | 181 | </PostBuildEvent> |
189 | </PropertyGroup> | 182 | </PropertyGroup> |
190 | </Project> \ No newline at end of file | 183 | </Project> |
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index 5b3e60b..32c1699 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build | |||
@@ -21,13 +21,12 @@ | |||
21 | <include name="NetworkServersInfo.cs" /> | 21 | <include name="NetworkServersInfo.cs" /> |
22 | <include name="OpenSimNetworkHandler.cs" /> | 22 | <include name="OpenSimNetworkHandler.cs" /> |
23 | <include name="PacketServer.cs" /> | 23 | <include name="PacketServer.cs" /> |
24 | <include name="RegionServerBase.cs" /> | ||
25 | <include name="UDPServer.cs" /> | ||
26 | <include name="UserConfigUtility.cs" /> | 24 | <include name="UserConfigUtility.cs" /> |
27 | <include name="VersionInfo.cs" /> | 25 | <include name="VersionInfo.cs" /> |
26 | <include name="RegionServerBase.cs" /> | ||
27 | <include name="UDPServer.cs" /> | ||
28 | <include name="Assets/AssetCache.cs" /> | 28 | <include name="Assets/AssetCache.cs" /> |
29 | <include name="Assets/InventoryCache.cs" /> | 29 | <include name="Assets/InventoryCache.cs" /> |
30 | <include name="CAPS/AdminWebFront.cs" /> | ||
31 | </sources> | 30 | </sources> |
32 | <references basedir="${project::get-base-directory()}"> | 31 | <references basedir="${project::get-base-directory()}"> |
33 | <lib> | 32 | <lib> |
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj index 0750742..6bcf38a 100644 --- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj +++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj | |||
@@ -1,4 +1,4 @@ | |||
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> |
@@ -6,8 +6,7 @@ | |||
6 | <ProjectGuid>{97A82740-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{97A82740-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.Scripting.EmbeddedJVM</AssemblyName> | 12 | <AssemblyName>OpenSim.Scripting.EmbeddedJVM</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.Scripting.EmbeddedJVM</RootNamespace> | 19 | <RootNamespace>OpenSim.Scripting.EmbeddedJVM</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,29 +55,28 @@ | |||
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="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL"> | 61 | <Reference Include="System" > |
69 | <SpecificVersion>False</SpecificVersion> | ||
70 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | ||
71 | </Reference> | ||
72 | <Reference Include="System"> | ||
73 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
74 | <Private>False</Private> | 63 | <Private>False</Private> |
75 | </Reference> | 64 | </Reference> |
76 | <Reference Include="System.Xml"> | 65 | <Reference Include="System.Xml" > |
77 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.dll</HintPath> |
78 | <Private>False</Private> | 67 | <Private>False</Private> |
79 | </Reference> | 68 | </Reference> |
69 | <Reference Include="libsecondlife.dll" > | ||
70 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | ||
71 | <Private>False</Private> | ||
72 | </Reference> | ||
80 | </ItemGroup> | 73 | </ItemGroup> |
81 | <ItemGroup> | 74 | <ItemGroup> |
82 | <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> | 75 | <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> |
83 | <Name>OpenSim.Framework</Name> | 76 | <Name>OpenSim.Framework</Name> |
84 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 77 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
85 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
86 | <Private>False</Private> | 79 | <Private>False</Private> |
87 | </ProjectReference> | 80 | </ProjectReference> |
88 | </ItemGroup> | 81 | </ItemGroup> |
89 | <ItemGroup> | 82 | <ItemGroup> |
@@ -102,9 +95,6 @@ | |||
102 | <Compile Include="InterpreterLogic.cs"> | 95 | <Compile Include="InterpreterLogic.cs"> |
103 | <SubType>Code</SubType> | 96 | <SubType>Code</SubType> |
104 | </Compile> | 97 | </Compile> |
105 | <Compile Include="InterpreterMethods.cs"> | ||
106 | <SubType>Code</SubType> | ||
107 | </Compile> | ||
108 | <Compile Include="InterpreterReturn.cs"> | 98 | <Compile Include="InterpreterReturn.cs"> |
109 | <SubType>Code</SubType> | 99 | <SubType>Code</SubType> |
110 | </Compile> | 100 | </Compile> |
@@ -129,6 +119,9 @@ | |||
129 | <Compile Include="Thread.cs"> | 119 | <Compile Include="Thread.cs"> |
130 | <SubType>Code</SubType> | 120 | <SubType>Code</SubType> |
131 | </Compile> | 121 | </Compile> |
122 | <Compile Include="InterpreterMethods.cs"> | ||
123 | <SubType>Code</SubType> | ||
124 | </Compile> | ||
132 | <Compile Include="Properties\AssemblyInfo.cs"> | 125 | <Compile Include="Properties\AssemblyInfo.cs"> |
133 | <SubType>Code</SubType> | 126 | <SubType>Code</SubType> |
134 | </Compile> | 127 | </Compile> |
@@ -161,4 +154,4 @@ | |||
161 | <PostBuildEvent> | 154 | <PostBuildEvent> |
162 | </PostBuildEvent> | 155 | </PostBuildEvent> |
163 | </PropertyGroup> | 156 | </PropertyGroup> |
164 | </Project> \ No newline at end of file | 157 | </Project> |
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build index c5255db..2ff51ef 100644 --- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build +++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build | |||
@@ -16,7 +16,6 @@ | |||
16 | <include name="Heap.cs" /> | 16 | <include name="Heap.cs" /> |
17 | <include name="Interpreter.cs" /> | 17 | <include name="Interpreter.cs" /> |
18 | <include name="InterpreterLogic.cs" /> | 18 | <include name="InterpreterLogic.cs" /> |
19 | <include name="InterpreterMethods.cs" /> | ||
20 | <include name="InterpreterReturn.cs" /> | 19 | <include name="InterpreterReturn.cs" /> |
21 | <include name="MainMemory.cs" /> | 20 | <include name="MainMemory.cs" /> |
22 | <include name="MethodMemory.cs" /> | 21 | <include name="MethodMemory.cs" /> |
@@ -25,6 +24,7 @@ | |||
25 | <include name="Stack.cs" /> | 24 | <include name="Stack.cs" /> |
26 | <include name="StackFrame.cs" /> | 25 | <include name="StackFrame.cs" /> |
27 | <include name="Thread.cs" /> | 26 | <include name="Thread.cs" /> |
27 | <include name="InterpreterMethods.cs" /> | ||
28 | <include name="Properties/AssemblyInfo.cs" /> | 28 | <include name="Properties/AssemblyInfo.cs" /> |
29 | <include name="Types/ArrayReference.cs" /> | 29 | <include name="Types/ArrayReference.cs" /> |
30 | <include name="Types/BaseType.cs" /> | 30 | <include name="Types/BaseType.cs" /> |
@@ -41,6 +41,7 @@ | |||
41 | </lib> | 41 | </lib> |
42 | <include name="System.dll" /> | 42 | <include name="System.dll" /> |
43 | <include name="System.Xml.dll" /> | 43 | <include name="System.Xml.dll" /> |
44 | <include name="../../../bin/libsecondlife.dll" /> | ||
44 | <include name="../../../bin/OpenSim.Framework.dll" /> | 45 | <include name="../../../bin/OpenSim.Framework.dll" /> |
45 | </references> | 46 | </references> |
46 | </csc> | 47 | </csc> |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj index 15ae5bf..6f92e76 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj +++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj | |||
@@ -90,19 +90,19 @@ | |||
90 | </ProjectReference> | 90 | </ProjectReference> |
91 | </ItemGroup> | 91 | </ItemGroup> |
92 | <ItemGroup> | 92 | <ItemGroup> |
93 | <Compile Include="AssemblyInfo.cs"> | 93 | <Compile Include="UUIDParcelQuery.cs"> |
94 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
95 | </Compile> | 95 | </Compile> |
96 | <Compile Include="Db4LocalStorage.cs"> | 96 | <Compile Include="UUIDPrimQuery.cs"> |
97 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
98 | </Compile> | 98 | </Compile> |
99 | <Compile Include="MapStorage.cs"> | 99 | <Compile Include="Db4LocalStorage.cs"> |
100 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
101 | </Compile> | 101 | </Compile> |
102 | <Compile Include="UUIDParcelQuery.cs"> | 102 | <Compile Include="AssemblyInfo.cs"> |
103 | <SubType>Code</SubType> | 103 | <SubType>Code</SubType> |
104 | </Compile> | 104 | </Compile> |
105 | <Compile Include="UUIDPrimQuery.cs"> | 105 | <Compile Include="MapStorage.cs"> |
106 | <SubType>Code</SubType> | 106 | <SubType>Code</SubType> |
107 | </Compile> | 107 | </Compile> |
108 | </ItemGroup> | 108 | </ItemGroup> |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build index c2fd2bd..7fb50c8 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build | |||
@@ -11,11 +11,11 @@ | |||
11 | <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="Db4LocalStorage.cs" /> | ||
16 | <include name="MapStorage.cs" /> | ||
17 | <include name="UUIDParcelQuery.cs" /> | 14 | <include name="UUIDParcelQuery.cs" /> |
18 | <include name="UUIDPrimQuery.cs" /> | 15 | <include name="UUIDPrimQuery.cs" /> |
16 | <include name="Db4LocalStorage.cs" /> | ||
17 | <include name="AssemblyInfo.cs" /> | ||
18 | <include name="MapStorage.cs" /> | ||
19 | </sources> | 19 | </sources> |
20 | <references basedir="${project::get-base-directory()}"> | 20 | <references basedir="${project::get-base-directory()}"> |
21 | <lib> | 21 | <lib> |