aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.Region
diff options
context:
space:
mode:
authorAdam Frisby2007-06-28 08:40:31 +0000
committerAdam Frisby2007-06-28 08:40:31 +0000
commit1ff47941919dc73b668d8eef07c8c9dd24d60969 (patch)
treee13457588efab35a0e41b35e41701631c393c00b /OpenSim/OpenSim.Region
parentShiny commit (finally) (diff)
downloadopensim-SC-1ff47941919dc73b668d8eef07c8c9dd24d60969.zip
opensim-SC-1ff47941919dc73b668d8eef07c8c9dd24d60969.tar.gz
opensim-SC-1ff47941919dc73b668d8eef07c8c9dd24d60969.tar.bz2
opensim-SC-1ff47941919dc73b668d8eef07c8c9dd24d60969.tar.xz
* Run prebuild, and stuff. (Fixed bug)
Diffstat (limited to 'OpenSim/OpenSim.Region')
-rw-r--r--OpenSim/OpenSim.Region/OpenSim.Region.csproj95
-rw-r--r--OpenSim/OpenSim.Region/OpenSim.Region.dll.build13
2 files changed, 60 insertions, 48 deletions
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 4131142..79f204d 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.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>{196916AF-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{196916AF-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</AssemblyName> 12 <AssemblyName>OpenSim.Region</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</RootNamespace> 19 <RootNamespace>OpenSim.Region</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,88 +55,92 @@
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 <Reference Include="System"> 74 <HintPath>Microsoft.JScript.dll</HintPath>
75 <Private>False</Private>
76 </Reference>
77 <Reference Include="System" >
82 <HintPath>System.dll</HintPath> 78 <HintPath>System.dll</HintPath>
83 <Private>False</Private> 79 <Private>False</Private>
84 </Reference> 80 </Reference>
85 <Reference Include="System.Data" /> 81 <Reference Include="System.Xml" >
86 <Reference Include="System.Xml">
87 <HintPath>System.Xml.dll</HintPath> 82 <HintPath>System.Xml.dll</HintPath>
88 <Private>False</Private> 83 <Private>False</Private>
89 </Reference> 84 </Reference>
90 <Reference Include="VJSharpCodeProvider" /> 85 <Reference Include="VJSharpCodeProvider" >
86 <HintPath>VJSharpCodeProvider.dll</HintPath>
87 <Private>False</Private>
88 </Reference>
91 </ItemGroup> 89 </ItemGroup>
92 <ItemGroup> 90 <ItemGroup>
93 <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj"> 91 <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj">
94 <Name>OpenGrid.Framework.Communications</Name> 92 <Name>OpenGrid.Framework.Communications</Name>
95 <Project>{683344D5-0000-0000-0000-000000000000}</Project> 93 <Project>{683344D5-0000-0000-0000-000000000000}</Project>
96 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 94 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
97 <Private>False</Private> 95 <Private>False</Private>
98 </ProjectReference> 96 </ProjectReference>
99 <ProjectReference Include="..\OpenSim.Caches\OpenSim.Caches.csproj"> 97 <ProjectReference Include="..\OpenSim.Caches\OpenSim.Caches.csproj">
100 <Name>OpenSim.Caches</Name> 98 <Name>OpenSim.Caches</Name>
101 <Project>{1938EB12-0000-0000-0000-000000000000}</Project> 99 <Project>{1938EB12-0000-0000-0000-000000000000}</Project>
102 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 100 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
103 <Private>False</Private> 101 <Private>False</Private>
104 </ProjectReference> 102 </ProjectReference>
105 <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> 103 <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
106 <Name>OpenSim.Framework</Name> 104 <Name>OpenSim.Framework</Name>
107 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 105 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
108 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 106 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
109 <Private>False</Private> 107 <Private>False</Private>
110 </ProjectReference> 108 </ProjectReference>
111 <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 109 <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
112 <Name>OpenSim.Framework.Console</Name> 110 <Name>OpenSim.Framework.Console</Name>
113 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 111 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
114 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 112 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
115 <Private>False</Private> 113 <Private>False</Private>
116 </ProjectReference> 114 </ProjectReference>
117 <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj"> 115 <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">
118 <Name>OpenSim.GenericConfig.Xml</Name> 116 <Name>OpenSim.GenericConfig.Xml</Name>
119 <Project>{E88EF749-0000-0000-0000-000000000000}</Project> 117 <Project>{E88EF749-0000-0000-0000-000000000000}</Project>
120 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 118 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
121 <Private>False</Private> 119 <Private>False</Private>
122 </ProjectReference> 120 </ProjectReference>
123 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> 121 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
124 <Name>OpenSim.Physics.Manager</Name> 122 <Name>OpenSim.Physics.Manager</Name>
125 <Project>{8BE16150-0000-0000-0000-000000000000}</Project> 123 <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
126 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 124 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
127 <Private>False</Private> 125 <Private>False</Private>
128 </ProjectReference> 126 </ProjectReference>
129 <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> 127 <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">
130 <Name>OpenSim.Servers</Name> 128 <Name>OpenSim.Servers</Name>
131 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> 129 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
132 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 130 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
133 <Private>False</Private> 131 <Private>False</Private>
134 </ProjectReference> 132 </ProjectReference>
135 <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj"> 133 <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj">
136 <Name>OpenSim.Terrain.BasicTerrain</Name> 134 <Name>OpenSim.Terrain.BasicTerrain</Name>
137 <Project>{2270B8FE-0000-0000-0000-000000000000}</Project> 135 <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>
138 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 136 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
139 <Private>False</Private> 137 <Private>False</Private>
140 </ProjectReference> 138 </ProjectReference>
141 <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj"> 139 <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj">
142 <Name>XMLRPC</Name> 140 <Name>XMLRPC</Name>
143 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> 141 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
144 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 142 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
145 <Private>False</Private> 143 <Private>False</Private>
146 </ProjectReference> 144 </ProjectReference>
147 </ItemGroup> 145 </ItemGroup>
148 <ItemGroup> 146 <ItemGroup>
@@ -179,7 +177,9 @@
179 <Compile Include="Scenes\SceneBase.cs"> 177 <Compile Include="Scenes\SceneBase.cs">
180 <SubType>Code</SubType> 178 <SubType>Code</SubType>
181 </Compile> 179 </Compile>
182 <Compile Include="Scenes\SceneEvents.cs" /> 180 <Compile Include="Scenes\SceneEvents.cs">
181 <SubType>Code</SubType>
182 </Compile>
183 <Compile Include="Scenes\SceneObject.cs"> 183 <Compile Include="Scenes\SceneObject.cs">
184 <SubType>Code</SubType> 184 <SubType>Code</SubType>
185 </Compile> 185 </Compile>
@@ -192,15 +192,24 @@
192 <Compile Include="Scenes\ScenePresence.cs"> 192 <Compile Include="Scenes\ScenePresence.cs">
193 <SubType>Code</SubType> 193 <SubType>Code</SubType>
194 </Compile> 194 </Compile>
195 <Compile Include="Scenes\Scripting\Engines\CSharpScriptEngine.cs" /> 195 <Compile Include="Scenes\scripting\Script.cs">
196 <Compile Include="Scenes\Scripting\Engines\JScriptEngine.cs" /> 196 <SubType>Code</SubType>
197 <Compile Include="Scenes\Scripting\Engines\JSharpScriptEngine.cs" /> 197 </Compile>
198 <Compile Include="Scenes\Scripting\Script.cs" /> 198 <Compile Include="Scenes\scripting\ScriptInfo.cs">
199 <Compile Include="Scenes\Scripting\ScriptInfo.cs" /> 199 <SubType>Code</SubType>
200 <Compile Include="Scenes\Scripting\ScriptManager.cs" /> 200 </Compile>
201 </ItemGroup> 201 <Compile Include="Scenes\scripting\ScriptManager.cs">
202 <ItemGroup> 202 <SubType>Code</SubType>
203 <Folder Include="Scenes\Scripting\CSharpScripts\" /> 203 </Compile>
204 <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs">
205 <SubType>Code</SubType>
206 </Compile>
207 <Compile Include="Scenes\scripting\Engines\JScriptEngine.cs">
208 <SubType>Code</SubType>
209 </Compile>
210 <Compile Include="Scenes\scripting\Engines\JSharpScriptEngine.cs">
211 <SubType>Code</SubType>
212 </Compile>
204 </ItemGroup> 213 </ItemGroup>
205 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> 214 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
206 <PropertyGroup> 215 <PropertyGroup>
@@ -209,4 +218,4 @@
209 <PostBuildEvent> 218 <PostBuildEvent>
210 </PostBuildEvent> 219 </PostBuildEvent>
211 </PropertyGroup> 220 </PropertyGroup>
212</Project> \ No newline at end of file 221</Project>
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index d2c3c2c..926b9ed 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
@@ -22,16 +22,17 @@
22 <include name="Scenes/Scene.PacketHandlers.cs" /> 22 <include name="Scenes/Scene.PacketHandlers.cs" />
23 <include name="Scenes/Scene.Scripting.cs" /> 23 <include name="Scenes/Scene.Scripting.cs" />
24 <include name="Scenes/SceneBase.cs" /> 24 <include name="Scenes/SceneBase.cs" />
25 <include name="Scenes/SceneEvents.cs" />
25 <include name="Scenes/SceneObject.cs" /> 26 <include name="Scenes/SceneObject.cs" />
26 <include name="Scenes/ScenePresence.Animations.cs" /> 27 <include name="Scenes/ScenePresence.Animations.cs" />
27 <include name="Scenes/ScenePresence.Body.cs" /> 28 <include name="Scenes/ScenePresence.Body.cs" />
28 <include name="Scenes/ScenePresence.cs" /> 29 <include name="Scenes/ScenePresence.cs" />
29 <include name="Scenes/scripting/IScriptContext.cs" />
30 <include name="Scenes/scripting/IScriptEntity.cs" />
31 <include name="Scenes/scripting/IScriptHandler.cs" />
32 <include name="Scenes/scripting/Script.cs" /> 30 <include name="Scenes/scripting/Script.cs" />
33 <include name="Scenes/scripting/ScriptFactory.cs" /> 31 <include name="Scenes/scripting/ScriptInfo.cs" />
34 <include name="Scenes/scripting/Scripts/FollowRandomAvatar.cs" /> 32 <include name="Scenes/scripting/ScriptManager.cs" />
33 <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" />
34 <include name="Scenes/scripting/Engines/JScriptEngine.cs" />
35 <include name="Scenes/scripting/Engines/JSharpScriptEngine.cs" />
35 </sources> 36 </sources>
36 <references basedir="${project::get-base-directory()}"> 37 <references basedir="${project::get-base-directory()}">
37 <lib> 38 <lib>
@@ -41,6 +42,7 @@
41 <include name="../../bin/Axiom.MathLib.dll" /> 42 <include name="../../bin/Axiom.MathLib.dll" />
42 <include name="../../bin/Db4objects.Db4o.dll" /> 43 <include name="../../bin/Db4objects.Db4o.dll" />
43 <include name="../../bin/libsecondlife.dll" /> 44 <include name="../../bin/libsecondlife.dll" />
45 <include name="Microsoft.JScript.dll" />
44 <include name="../../bin/OpenGrid.Framework.Communications.dll" /> 46 <include name="../../bin/OpenGrid.Framework.Communications.dll" />
45 <include name="../../bin/OpenSim.Caches.dll" /> 47 <include name="../../bin/OpenSim.Caches.dll" />
46 <include name="../../bin/OpenSim.Framework.dll" /> 48 <include name="../../bin/OpenSim.Framework.dll" />
@@ -51,6 +53,7 @@
51 <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" /> 53 <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" />
52 <include name="System.dll" /> 54 <include name="System.dll" />
53 <include name="System.Xml.dll" /> 55 <include name="System.Xml.dll" />
56 <include name="VJSharpCodeProvider.dll" />
54 <include name="../../bin/XMLRPC.dll" /> 57 <include name="../../bin/XMLRPC.dll" />
55 </references> 58 </references>
56 </csc> 59 </csc>
generated by cgit v1.1 at 2024-12-25 13:43:11 +0000