aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTedd Hansen2008-02-02 05:03:28 +0000
committerTedd Hansen2008-02-02 05:03:28 +0000
commita004ea5f1772e6e36efae29980f2d95a9efeb851 (patch)
tree59ea076e5eaafbaf594d7eabbfce169062328146
parentNote to self: Next time read debug-files on correct computer. It makes bughun... (diff)
downloadopensim-SC_OLD-a004ea5f1772e6e36efae29980f2d95a9efeb851.zip
opensim-SC_OLD-a004ea5f1772e6e36efae29980f2d95a9efeb851.tar.gz
opensim-SC_OLD-a004ea5f1772e6e36efae29980f2d95a9efeb851.tar.bz2
opensim-SC_OLD-a004ea5f1772e6e36efae29980f2d95a9efeb851.tar.xz
Almost forgot to check in:
OpenSim.32BitLaunch.exe is a 32-bit application that loads OpenSim.exe using .Net framework, hence it is JIT-compiled to 32-bit. Use this app to start OpenSim on 64-bit systems (works great on Vista 64 :))
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs2
-rw-r--r--OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj63
-rw-r--r--OpenSim/Tools/OpenSim.32BitLaunch/Program.cs10
-rw-r--r--OpenSim/Tools/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs36
-rw-r--r--bin/OpenSim.32BitLaunch.exebin0 -> 4608 bytes
-rw-r--r--bin/OpenSim.32BitLaunch.pdbbin0 -> 11776 bytes
-rw-r--r--bin/OpenSim.32BitLaunch.vshost.exebin0 -> 14848 bytes
7 files changed, 110 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index bbb380e..ded0fcc 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -273,7 +273,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
273 case enumCompileType.vb: 273 case enumCompileType.vb:
274 compileScript = String.Empty + 274 compileScript = String.Empty +
275 "Imports OpenSim.Region.ScriptEngine.Common: Imports System.Collections.Generic: " + 275 "Imports OpenSim.Region.ScriptEngine.Common: Imports System.Collections.Generic: " +
276 String.Empty + "NameSpace SecondLife { " + 276 String.Empty + "NameSpace SecondLife:" +
277 String.Empty + "Public Class Script: Inherits OpenSim.Region.ScriptEngine.Common.LSL_BaseClass: " + 277 String.Empty + "Public Class Script: Inherits OpenSim.Region.ScriptEngine.Common.LSL_BaseClass: " +
278 @"Public Sub New(): End Sub: " + 278 @"Public Sub New(): End Sub: " +
279 compileScript + 279 compileScript +
diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj b/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
new file mode 100644
index 0000000..d5886e2
--- /dev/null
+++ b/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
@@ -0,0 +1,63 @@
1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <PropertyGroup>
4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6 <ProductVersion>9.0.21022</ProductVersion>
7 <SchemaVersion>2.0</SchemaVersion>
8 <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
9 <OutputType>Exe</OutputType>
10 <AppDesignerFolder>Properties</AppDesignerFolder>
11 <RootNamespace>OpenSim._32BitLaunch</RootNamespace>
12 <AssemblyName>OpenSim.32BitLaunch</AssemblyName>
13 <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
14 <FileAlignment>512</FileAlignment>
15 </PropertyGroup>
16 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17 <DebugSymbols>true</DebugSymbols>
18 <DebugType>full</DebugType>
19 <Optimize>false</Optimize>
20 <OutputPath>..\..\..\bin\</OutputPath>
21 <DefineConstants>DEBUG;TRACE</DefineConstants>
22 <ErrorReport>prompt</ErrorReport>
23 <WarningLevel>4</WarningLevel>
24 <PlatformTarget>x86</PlatformTarget>
25 </PropertyGroup>
26 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27 <DebugType>pdbonly</DebugType>
28 <Optimize>true</Optimize>
29 <OutputPath>bin\Release\</OutputPath>
30 <DefineConstants>TRACE</DefineConstants>
31 <ErrorReport>prompt</ErrorReport>
32 <WarningLevel>4</WarningLevel>
33 </PropertyGroup>
34 <ItemGroup>
35 <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" />
43 <Reference Include="System.Xml" />
44 </ItemGroup>
45 <ItemGroup>
46 <Compile Include="Program.cs" />
47 <Compile Include="Properties\AssemblyInfo.cs" />
48 </ItemGroup>
49 <ItemGroup>
50 <ProjectReference Include="..\..\Region\Application\OpenSim.csproj">
51 <Project>{AC9EB8AB-0000-0000-0000-000000000000}</Project>
52 <Name>OpenSim</Name>
53 </ProjectReference>
54 </ItemGroup>
55 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
56 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
57 Other similar extension points exist, see Microsoft.Common.targets.
58 <Target Name="BeforeBuild">
59 </Target>
60 <Target Name="AfterBuild">
61 </Target>
62 -->
63</Project> \ No newline at end of file
diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs b/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs
new file mode 100644
index 0000000..ba2f461
--- /dev/null
+++ b/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs
@@ -0,0 +1,10 @@
1namespace OpenSim._32BitLaunch
2{
3 class Program
4 {
5 static void Main(string[] args)
6 {
7 OpenSim.Application.Main(args);
8 }
9 }
10}
diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs b/OpenSim/Tools/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..cd83f3f
--- /dev/null
+++ b/OpenSim/Tools/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
1using System.Reflection;
2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices;
4
5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly.
8[assembly: AssemblyTitle("OpenSim.32BitLaunch")]
9[assembly: AssemblyDescription("")]
10[assembly: AssemblyConfiguration("")]
11[assembly: AssemblyCompany("Microsoft")]
12[assembly: AssemblyProduct("OpenSim.32BitLaunch")]
13[assembly: AssemblyCopyright("Copyright © Microsoft 2008")]
14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")]
16
17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)]
21
22// The following GUID is for the ID of the typelib if this project is exposed to COM
23[assembly: Guid("5072e919-46ab-47e6-8a63-08108324ccdf")]
24
25// Version information for an assembly consists of the following four values:
26//
27// Major Version
28// Minor Version
29// Build Number
30// Revision
31//
32// You can specify all the values or you can default the Build and Revision Numbers
33// by using the '*' as shown below:
34// [assembly: AssemblyVersion("1.0.*")]
35[assembly: AssemblyVersion("1.0.0.0")]
36[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/bin/OpenSim.32BitLaunch.exe b/bin/OpenSim.32BitLaunch.exe
new file mode 100644
index 0000000..64bef64
--- /dev/null
+++ b/bin/OpenSim.32BitLaunch.exe
Binary files differ
diff --git a/bin/OpenSim.32BitLaunch.pdb b/bin/OpenSim.32BitLaunch.pdb
new file mode 100644
index 0000000..f444e0d
--- /dev/null
+++ b/bin/OpenSim.32BitLaunch.pdb
Binary files differ
diff --git a/bin/OpenSim.32BitLaunch.vshost.exe b/bin/OpenSim.32BitLaunch.vshost.exe
new file mode 100644
index 0000000..9c4b9b8
--- /dev/null
+++ b/bin/OpenSim.32BitLaunch.vshost.exe
Binary files differ