aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTedd Hansen2008-10-16 15:09:02 +0000
committerTedd Hansen2008-10-16 15:09:02 +0000
commit9a200da0d2e359ecfe3cca5e6c319179a8897d9b (patch)
tree88d49980a17b6bfea2e112ec7c36a1b336261c72
parent* Apply http://opensimulator.org/mantis/view.php?id=2405 (diff)
downloadopensim-SC_OLD-9a200da0d2e359ecfe3cca5e6c319179a8897d9b.zip
opensim-SC_OLD-9a200da0d2e359ecfe3cca5e6c319179a8897d9b.tar.gz
opensim-SC_OLD-9a200da0d2e359ecfe3cca5e6c319179a8897d9b.tar.bz2
opensim-SC_OLD-9a200da0d2e359ecfe3cca5e6c319179a8897d9b.tar.xz
Updated 32Bit launcher so it works in Visual Studio again. (So developers on 64-bit os can run OpenSim in 32-bit mode)
-rw-r--r--OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj11
-rw-r--r--OpenSim/Tools/OpenSim.32BitLaunch/Program.cs2
-rwxr-xr-xbin/OpenSim.32BitLaunch.exebin5632 -> 5632 bytes
-rw-r--r--bin/OpenSim.32BitLaunch.pdbbin11776 -> 11776 bytes
4 files changed, 4 insertions, 9 deletions
diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj b/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
index bfca5e4..d829e69 100644
--- a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
+++ b/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
@@ -3,7 +3,7 @@
3 <PropertyGroup> 3 <PropertyGroup>
4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6 <ProductVersion>9.0.21022</ProductVersion> 6 <ProductVersion>9.0.30729</ProductVersion>
7 <SchemaVersion>2.0</SchemaVersion> 7 <SchemaVersion>2.0</SchemaVersion>
8 <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid> 8 <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
9 <OutputType>Exe</OutputType> 9 <OutputType>Exe</OutputType>
@@ -32,13 +32,8 @@
32 <WarningLevel>4</WarningLevel> 32 <WarningLevel>4</WarningLevel>
33 </PropertyGroup> 33 </PropertyGroup>
34 <ItemGroup> 34 <ItemGroup>
35 <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" />
35 <Reference Include="System" /> 36 <Reference Include="System" />
36 <Reference Include="System.Xml.Linq">
37 <RequiredTargetFramework>3.5</RequiredTargetFramework>
38 </Reference>
39 <Reference Include="System.Data.DataSetExtensions">
40 <RequiredTargetFramework>3.5</RequiredTargetFramework>
41 </Reference>
42 <Reference Include="System.Data" /> 37 <Reference Include="System.Data" />
43 <Reference Include="System.Xml" /> 38 <Reference Include="System.Xml" />
44 </ItemGroup> 39 </ItemGroup>
@@ -48,7 +43,7 @@
48 </ItemGroup> 43 </ItemGroup>
49 <ItemGroup> 44 <ItemGroup>
50 <ProjectReference Include="..\..\Region\Application\OpenSim.csproj"> 45 <ProjectReference Include="..\..\Region\Application\OpenSim.csproj">
51 <Project>{AC9EB8AB-0000-0000-0000-000000000000}</Project> 46 <Project>{438A9556-0000-0000-0000-000000000000}</Project>
52 <Name>OpenSim</Name> 47 <Name>OpenSim</Name>
53 </ProjectReference> 48 </ProjectReference>
54 </ItemGroup> 49 </ItemGroup>
diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs b/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs
index 0c4de02..b292d43 100644
--- a/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs
+++ b/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs
@@ -44,7 +44,7 @@ namespace OpenSim._32BitLaunch
44 System.Threading.Thread.Sleep(300); 44 System.Threading.Thread.Sleep(300);
45 try 45 try
46 { 46 {
47 OpenSim.Application.Main(args); 47 global::OpenSim.Application.Main(args);
48 } 48 }
49 catch (Exception ex) 49 catch (Exception ex)
50 { 50 {
diff --git a/bin/OpenSim.32BitLaunch.exe b/bin/OpenSim.32BitLaunch.exe
index 70b46ae..a028deb 100755
--- a/bin/OpenSim.32BitLaunch.exe
+++ b/bin/OpenSim.32BitLaunch.exe
Binary files differ
diff --git a/bin/OpenSim.32BitLaunch.pdb b/bin/OpenSim.32BitLaunch.pdb
index f532ee2..0af0597 100644
--- a/bin/OpenSim.32BitLaunch.pdb
+++ b/bin/OpenSim.32BitLaunch.pdb
Binary files differ