aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorAdam Frisby2007-07-08 02:58:01 +0000
committerAdam Frisby2007-07-08 02:58:01 +0000
commit10ece46cf681f389b9ecce5e89b94d749a44e9c1 (patch)
tree82a545774d62ba188db435b1b1f4123d7242bc2f /OpenSim/Region/Environment
parent*Reverting lbsa71's commit as requred (diff)
downloadopensim-SC-10ece46cf681f389b9ecce5e89b94d749a44e9c1.zip
opensim-SC-10ece46cf681f389b9ecce5e89b94d749a44e9c1.tar.gz
opensim-SC-10ece46cf681f389b9ecce5e89b94d749a44e9c1.tar.bz2
opensim-SC-10ece46cf681f389b9ecce5e89b94d749a44e9c1.tar.xz
* Updating prebuild
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/OpenSim.Region.Environment.csproj62
-rw-r--r--OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build1
2 files changed, 29 insertions, 34 deletions
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
index 3b86468..048f326 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.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>{DCBA491C-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,36 +55,34 @@
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="Microsoft.JScript"> 73 <Reference Include="Microsoft.JScript" >
81 <HintPath>Microsoft.JScript.dll</HintPath> 74 <HintPath>Microsoft.JScript.dll</HintPath>
82 <Private>False</Private> 75 <Private>False</Private>
83 </Reference> 76 </Reference>
84 <Reference Include="System"> 77 <Reference Include="System" >
85 <HintPath>System.dll</HintPath> 78 <HintPath>System.dll</HintPath>
86 <Private>False</Private> 79 <Private>False</Private>
87 </Reference> 80 </Reference>
88 <Reference Include="System.Data" /> 81 <Reference Include="System.Xml" >
89 <Reference Include="System.Xml">
90 <HintPath>System.Xml.dll</HintPath> 82 <HintPath>System.Xml.dll</HintPath>
91 <Private>False</Private> 83 <Private>False</Private>
92 </Reference> 84 </Reference>
93 <Reference Include="XMLRPC.dll"> 85 <Reference Include="XMLRPC.dll" >
94 <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> 86 <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
95 <Private>False</Private> 87 <Private>False</Private>
96 </Reference> 88 </Reference>
@@ -100,55 +92,55 @@
100 <Name>OpenSim.Framework</Name> 92 <Name>OpenSim.Framework</Name>
101 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 93 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
102 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 94 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
103 <Private>False</Private> 95 <Private>False</Private>
104 </ProjectReference> 96 </ProjectReference>
105 <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj"> 97 <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj">
106 <Name>OpenSim.Framework.Communications</Name> 98 <Name>OpenSim.Framework.Communications</Name>
107 <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project> 99 <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project>
108 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 100 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
109 <Private>False</Private> 101 <Private>False</Private>
110 </ProjectReference> 102 </ProjectReference>
111 <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj"> 103 <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj">
112 <Name>OpenSim.Framework.Console</Name> 104 <Name>OpenSim.Framework.Console</Name>
113 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 105 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
114 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 106 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
115 <Private>False</Private> 107 <Private>False</Private>
116 </ProjectReference> 108 </ProjectReference>
117 <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj"> 109 <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj">
118 <Name>OpenSim.Framework.GenericConfig.Xml</Name> 110 <Name>OpenSim.Framework.GenericConfig.Xml</Name>
119 <Project>{C74E4A30-0000-0000-0000-000000000000}</Project> 111 <Project>{C74E4A30-0000-0000-0000-000000000000}</Project>
120 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 112 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
121 <Private>False</Private> 113 <Private>False</Private>
122 </ProjectReference> 114 </ProjectReference>
123 <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj"> 115 <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj">
124 <Name>OpenSim.Framework.Servers</Name> 116 <Name>OpenSim.Framework.Servers</Name>
125 <Project>{2CC71860-0000-0000-0000-000000000000}</Project> 117 <Project>{2CC71860-0000-0000-0000-000000000000}</Project>
126 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 118 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
127 <Private>False</Private> 119 <Private>False</Private>
128 </ProjectReference> 120 </ProjectReference>
129 <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj"> 121 <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj">
130 <Name>OpenSim.Region.Caches</Name> 122 <Name>OpenSim.Region.Caches</Name>
131 <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project> 123 <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
132 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 124 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
133 <Private>False</Private> 125 <Private>False</Private>
134 </ProjectReference> 126 </ProjectReference>
135 <ProjectReference Include="..\Capabilities\OpenSim.Region.Capabilities.csproj"> 127 <ProjectReference Include="..\Capabilities\OpenSim.Region.Capabilities.csproj">
136 <Name>OpenSim.Region.Capabilities</Name> 128 <Name>OpenSim.Region.Capabilities</Name>
137 <Project>{39038E85-0000-0000-0000-000000000000}</Project> 129 <Project>{39038E85-0000-0000-0000-000000000000}</Project>
138 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 130 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
139 <Private>False</Private> 131 <Private>False</Private>
140 </ProjectReference> 132 </ProjectReference>
141 <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj"> 133 <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
142 <Name>OpenSim.Region.Physics.Manager</Name> 134 <Name>OpenSim.Region.Physics.Manager</Name>
143 <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project> 135 <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
144 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 136 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
145 <Private>False</Private> 137 <Private>False</Private>
146 </ProjectReference> 138 </ProjectReference>
147 <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj"> 139 <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj">
148 <Name>OpenSim.Region.Terrain.BasicTerrain</Name> 140 <Name>OpenSim.Region.Terrain.BasicTerrain</Name>
149 <Project>{C9E0F891-0000-0000-0000-000000000000}</Project> 141 <Project>{C9E0F891-0000-0000-0000-000000000000}</Project>
150 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 142 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
151 <Private>False</Private> 143 <Private>False</Private>
152 </ProjectReference> 144 </ProjectReference>
153 </ItemGroup> 145 </ItemGroup>
154 <ItemGroup> 146 <ItemGroup>
@@ -200,7 +192,6 @@
200 <Compile Include="Scenes\ScenePresence.cs"> 192 <Compile Include="Scenes\ScenePresence.cs">
201 <SubType>Code</SubType> 193 <SubType>Code</SubType>
202 </Compile> 194 </Compile>
203 <Compile Include="Scenes\scripting\Engines\JVMEngine\JavaEngine.cs" />
204 <Compile Include="Scenes\scripting\Script.cs"> 195 <Compile Include="Scenes\scripting\Script.cs">
205 <SubType>Code</SubType> 196 <SubType>Code</SubType>
206 </Compile> 197 </Compile>
@@ -240,6 +231,9 @@
240 <Compile Include="Scenes\scripting\Engines\JVMEngine\InterpreterReturn.cs"> 231 <Compile Include="Scenes\scripting\Engines\JVMEngine\InterpreterReturn.cs">
241 <SubType>Code</SubType> 232 <SubType>Code</SubType>
242 </Compile> 233 </Compile>
234 <Compile Include="Scenes\scripting\Engines\JVMEngine\JavaEngine.cs">
235 <SubType>Code</SubType>
236 </Compile>
243 <Compile Include="Scenes\scripting\Engines\JVMEngine\MainMemory.cs"> 237 <Compile Include="Scenes\scripting\Engines\JVMEngine\MainMemory.cs">
244 <SubType>Code</SubType> 238 <SubType>Code</SubType>
245 </Compile> 239 </Compile>
@@ -290,4 +284,4 @@
290 <PostBuildEvent> 284 <PostBuildEvent>
291 </PostBuildEvent> 285 </PostBuildEvent>
292 </PropertyGroup> 286 </PropertyGroup>
293</Project> \ No newline at end of file 287</Project>
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
index 52d9a26..bba3266 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
@@ -40,6 +40,7 @@
40 <include name="Scenes/scripting/Engines/JVMEngine/InterpreterLogic.cs" /> 40 <include name="Scenes/scripting/Engines/JVMEngine/InterpreterLogic.cs" />
41 <include name="Scenes/scripting/Engines/JVMEngine/InterpreterMethods.cs" /> 41 <include name="Scenes/scripting/Engines/JVMEngine/InterpreterMethods.cs" />
42 <include name="Scenes/scripting/Engines/JVMEngine/InterpreterReturn.cs" /> 42 <include name="Scenes/scripting/Engines/JVMEngine/InterpreterReturn.cs" />
43 <include name="Scenes/scripting/Engines/JVMEngine/JavaEngine.cs" />
43 <include name="Scenes/scripting/Engines/JVMEngine/MainMemory.cs" /> 44 <include name="Scenes/scripting/Engines/JVMEngine/MainMemory.cs" />
44 <include name="Scenes/scripting/Engines/JVMEngine/MethodMemory.cs" /> 45 <include name="Scenes/scripting/Engines/JVMEngine/MethodMemory.cs" />
45 <include name="Scenes/scripting/Engines/JVMEngine/Object.cs" /> 46 <include name="Scenes/scripting/Engines/JVMEngine/Object.cs" />