diff options
author | mingchen | 2007-06-27 19:04:23 +0000 |
---|---|---|
committer | mingchen | 2007-06-27 19:04:23 +0000 |
commit | 9eaecabdd0884cfe17d249440badce1ecdbcc142 (patch) | |
tree | d8decfccf4aea6460e322e2a0d7a26228b4041fe /OpenSim/Region/Terrain.BasicTerrain | |
parent | *Fixed OpenGridServices.sln and prebuild.xml (diff) | |
download | opensim-SC_OLD-9eaecabdd0884cfe17d249440badce1ecdbcc142.zip opensim-SC_OLD-9eaecabdd0884cfe17d249440badce1ecdbcc142.tar.gz opensim-SC_OLD-9eaecabdd0884cfe17d249440badce1ecdbcc142.tar.bz2 opensim-SC_OLD-9eaecabdd0884cfe17d249440badce1ecdbcc142.tar.xz |
*Moved VersionInfo.cs to its correct place in OpenSim.csproj
*Added OpenSim.Region.Caps
*Updated prebuild.xml and ran prebuild
Diffstat (limited to 'OpenSim/Region/Terrain.BasicTerrain')
4 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj index 24667e5..60a2d2b 100644 --- a/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj +++ b/OpenSim/Region/Terrain.BasicTerrain/OpenSim.Region.Terrain.BasicTerrain.csproj | |||
@@ -90,10 +90,10 @@ | |||
90 | <ItemGroup> | 90 | <ItemGroup> |
91 | </ItemGroup> | 91 | </ItemGroup> |
92 | <ItemGroup> | 92 | <ItemGroup> |
93 | <Compile Include="TerrainEngine.cs"> | 93 | <Compile Include="TerrainFilter.cs"> |
94 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
95 | </Compile> | 95 | </Compile> |
96 | <Compile Include="TerrainFilter.cs"> | 96 | <Compile Include="TerrainEngine.cs"> |
97 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
98 | </Compile> | 98 | </Compile> |
99 | <Compile Include="Properties\AssemblyInfo.cs"> | 99 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs b/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs index 827c68f..7d10ae3 100644 --- a/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Terrain.BasicTerrain/Properties/AssemblyInfo.cs | |||
@@ -32,11 +32,11 @@ using System.Runtime.InteropServices; | |||
32 | // General Information about an assembly is controlled through the following | 32 | // General Information about an assembly is controlled through the following |
33 | // set of attributes. Change these attribute values to modify the information | 33 | // set of attributes. Change these attribute values to modify the information |
34 | // associated with an assembly. | 34 | // associated with an assembly. |
35 | [assembly: AssemblyTitle("OpenSim.Terrain.BasicTerrain")] | 35 | [assembly: AssemblyTitle("OpenSim.Region.Terrain.BasicTerrain")] |
36 | [assembly: AssemblyDescription("")] | 36 | [assembly: AssemblyDescription("")] |
37 | [assembly: AssemblyConfiguration("")] | 37 | [assembly: AssemblyConfiguration("")] |
38 | [assembly: AssemblyCompany("")] | 38 | [assembly: AssemblyCompany("")] |
39 | [assembly: AssemblyProduct("OpenSim.Terrain.BasicTerrain")] | 39 | [assembly: AssemblyProduct("OpenSim.Region.Terrain.BasicTerrain")] |
40 | [assembly: AssemblyCopyright("Copyright © 2007")] | 40 | [assembly: AssemblyCopyright("Copyright © 2007")] |
41 | [assembly: AssemblyTrademark("")] | 41 | [assembly: AssemblyTrademark("")] |
42 | [assembly: AssemblyCulture("")] | 42 | [assembly: AssemblyCulture("")] |
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs index 4f989fa..c2d7e86 100644 --- a/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs +++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs | |||
@@ -32,7 +32,7 @@ using System.Drawing; | |||
32 | using libTerrain; | 32 | using libTerrain; |
33 | using OpenJPEGNet; | 33 | using OpenJPEGNet; |
34 | 34 | ||
35 | namespace OpenSim.Terrain | 35 | namespace OpenSim.Region.Terrain |
36 | { | 36 | { |
37 | public class TerrainCommand | 37 | public class TerrainCommand |
38 | { | 38 | { |
diff --git a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs index 689375d..f04ac56 100644 --- a/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs +++ b/OpenSim/Region/Terrain.BasicTerrain/TerrainFilter.cs | |||
@@ -9,7 +9,7 @@ using Microsoft.JScript; | |||
9 | 9 | ||
10 | using libTerrain; | 10 | using libTerrain; |
11 | 11 | ||
12 | namespace OpenSim.Terrain | 12 | namespace OpenSim.Region.Terrain |
13 | { | 13 | { |
14 | public interface ITerrainFilter | 14 | public interface ITerrainFilter |
15 | { | 15 | { |
@@ -48,7 +48,7 @@ namespace OpenSim.Terrain | |||
48 | compilerParams.GenerateInMemory = true; | 48 | compilerParams.GenerateInMemory = true; |
49 | compilerParams.IncludeDebugInformation = false; | 49 | compilerParams.IncludeDebugInformation = false; |
50 | compilerParams.ReferencedAssemblies.Add("libTerrain-BSD.dll"); | 50 | compilerParams.ReferencedAssemblies.Add("libTerrain-BSD.dll"); |
51 | compilerParams.ReferencedAssemblies.Add("OpenSim.Terrain.BasicTerrain.dll"); | 51 | compilerParams.ReferencedAssemblies.Add("OpenSim.Region.Terrain.BasicTerrain.dll"); |
52 | compilerParams.ReferencedAssemblies.Add("System.dll"); | 52 | compilerParams.ReferencedAssemblies.Add("System.dll"); |
53 | 53 | ||
54 | compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename); | 54 | compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename); |