From a004ea5f1772e6e36efae29980f2d95a9efeb851 Mon Sep 17 00:00:00 2001 From: Tedd Hansen Date: Sat, 2 Feb 2008 05:03:28 +0000 Subject: [PATCH] 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 :)) --- .../DotNetEngine/Compiler/LSL/Compiler.cs | 2 +- .../OpenSim.32BitLaunch.csproj | 63 ++++++++++++++++++ OpenSim/Tools/OpenSim.32BitLaunch/Program.cs | 10 +++ .../Properties/AssemblyInfo.cs | 36 ++++++++++ bin/OpenSim.32BitLaunch.exe | Bin 0 -> 4608 bytes bin/OpenSim.32BitLaunch.pdb | Bin 0 -> 11776 bytes bin/OpenSim.32BitLaunch.vshost.exe | Bin 0 -> 14848 bytes 7 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj create mode 100644 OpenSim/Tools/OpenSim.32BitLaunch/Program.cs create mode 100644 OpenSim/Tools/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs create mode 100644 bin/OpenSim.32BitLaunch.exe create mode 100644 bin/OpenSim.32BitLaunch.pdb create mode 100644 bin/OpenSim.32BitLaunch.vshost.exe diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs index bbb380e241..ded0fcc1c7 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 case enumCompileType.vb: compileScript = String.Empty + "Imports OpenSim.Region.ScriptEngine.Common: Imports System.Collections.Generic: " + - String.Empty + "NameSpace SecondLife { " + + String.Empty + "NameSpace SecondLife:" + String.Empty + "Public Class Script: Inherits OpenSim.Region.ScriptEngine.Common.LSL_BaseClass: " + @"Public Sub New(): End Sub: " + compileScript + diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj b/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj new file mode 100644 index 0000000000..d5886e2c4c --- /dev/null +++ b/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj @@ -0,0 +1,63 @@ + + + + Debug + AnyCPU + 9.0.21022 + 2.0 + {595D67F3-B413-4A43-8568-5B5930E3B31D} + Exe + Properties + OpenSim._32BitLaunch + OpenSim.32BitLaunch + v2.0 + 512 + + + true + full + false + ..\..\..\bin\ + DEBUG;TRACE + prompt + 4 + x86 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + 3.5 + + + 3.5 + + + + + + + + + + + {AC9EB8AB-0000-0000-0000-000000000000} + OpenSim + + + + + \ 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 0000000000..ba2f4614aa --- /dev/null +++ b/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs @@ -0,0 +1,10 @@ +namespace OpenSim._32BitLaunch +{ + class Program + { + static void Main(string[] args) + { + OpenSim.Application.Main(args); + } + } +} diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs b/OpenSim/Tools/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..cd83f3fd10 --- /dev/null +++ b/OpenSim/Tools/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("OpenSim.32BitLaunch")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyProduct("OpenSim.32BitLaunch")] +[assembly: AssemblyCopyright("Copyright © Microsoft 2008")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("5072e919-46ab-47e6-8a63-08108324ccdf")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/bin/OpenSim.32BitLaunch.exe b/bin/OpenSim.32BitLaunch.exe new file mode 100644 index 0000000000000000000000000000000000000000..64bef6400a245b893009df45a004385b386b551c GIT binary patch literal 4608 zcmeHK-ESP#6+g57z%h*#N(i=S)0=hpNWkOICQh))I(8B}*w}a-2Z*I)cJ_Kbcs`c7 zGp@IlT34#7qN?KKFQ{4-foK&TkceojsvsmJgy0F~F+zDjyZ{nH3KD_eJ+r%BdlzJ0 zY47^}=A3)ZJ?GqW@65TLdE!}WBBEyWufHa`f~Rg7#_xs=h&z7vdI!C_>)iuajOlj| zEUY+66vLnpTAr{i-wz^@lOl|L;rL==HY>a!FU{S%+Ygpa&z&NgHk#E6Mn~lsD{o;ZQv(s)Xhk)N8tC~0)ULyS&kbVH$imC3{_}@{s zLdP#Ct?@n%r#=eZ=dyGav|d*CnR8PUczy)_n&wZsK@LydFx@zF2hlFgd}$2QK3)s` zIFWH`bTkN$cB5+=bI{t$QMS@7GSW)xv#nBO4DIvMRRjPk3UC?9N81h{l4=8 zbo4ZXEUe)I?WHcp1B{0l`x%chjxkO#J__uj$C;{cg-7h^XvWYYaSK1k<5Kgi<`GiH%HlWh76aFs3t6}~Md{fhoe%^OM1v4nCv zkL4sgkPH}fq9Uq!Cb`1E$V`xrUHK5r7NwtcJacg1q!UeBv2U-Ka$V9~@(HTSFV-lK zr|ckfog8ILDv}<}=AM*xL^GD-lW9jmNLGl0mq^Wdx$Hvh1U`)^CB2+mT5uv)jzu`2 zxj2&5;R&hi&?#!wdf|BBFFS=ew7yO36)nG1KMyO($97aN7!Qi2&?&4m5G{mOUV2uz z+F(}fMsZjZd}WofA32^hr~F8UK`|@CHOH2U#shEBQBJOQy=P)4UvGI)hN|JpPdl!x z6PDdhI994zN&r8=@XG(3xI-jgk z&x0uExK31)@&<>ga)4;8Sacnm?cw}22|ks7u;2UQ`IjG_d9AJE`46qr2DQER%caGx zp=(d$?KOVd0X3sp7)FPNR14s?QBAgW8gzRjZ`8scf)0ar%{X=#s9+g2LKt*cb+^SE zFNvy54D|I46CE<>p#Gf7WBtc^hK^Xdo}r`iNYAi!WU!}ixW8|BaA3%`^UL`98gxrP zKEC+jlM06YfzY2&USP6q)DAujiY5lhP=#!`)lbAi9 zoyfj@`Ob@9b^Y<|KVE+HZ*N`y*XMe|`0=IkN|z#B16BvB>_QN@s>0R2!An8z$tB+T zMpCnw&%y4sa@_(+H#IFZRo^Q0ZBue_JP1#%OMcz?Qy`_8cXbWI4d`wX8K(X>A;q;- zpagd!0XSM4Tl0`qsJU+$UuiI|=WjED5k5-vET}(caDMbLCe8-p@F5}u}&XVenXT4O*F(+eH`{Y zDzc9fR%C&b+BnU?q7AzNd)da(vwa7)=YN>zjA4%ya^~SAxyY8lyRmiWw$J79DIu!Hrt%VZj;ORHB3+r% z!nZuQpDEQ;UDGNS)4hoW6cQCp`OCo$;~7ZvJor}9jzjn?^B4)`Q!(O{`MJ#%Zp+oy$zzN ogxO$>#{)3GOBeYoC_v-V%-}&&o-&wsue^`rX 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 a+FxSVtUg-sgoEwWSzzGj_VF`unDjq!Lbo3P literal 0 HcmV?d00001