From 9a200da0d2e359ecfe3cca5e6c319179a8897d9b Mon Sep 17 00:00:00 2001
From: Tedd Hansen <tedd@konge.net>
Date: Thu, 16 Oct 2008 15:09:02 +0000
Subject: [PATCH] Updated 32Bit launcher so it works in Visual Studio again.
 (So developers on 64-bit os can run OpenSim in 32-bit mode)

---
 .../OpenSim.32BitLaunch.csproj                |  11 +++--------
 OpenSim/Tools/OpenSim.32BitLaunch/Program.cs  |   2 +-
 bin/OpenSim.32BitLaunch.exe                   | Bin 5632 -> 5632 bytes
 bin/OpenSim.32BitLaunch.pdb                   | Bin 11776 -> 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 bfca5e4d77..d829e693e8 100644
--- a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
+++ b/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
     <OutputType>Exe</OutputType>
@@ -32,13 +32,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" />
     <Reference Include="System" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -48,7 +43,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Region\Application\OpenSim.csproj">
-      <Project>{AC9EB8AB-0000-0000-0000-000000000000}</Project>
+      <Project>{438A9556-0000-0000-0000-000000000000}</Project>
       <Name>OpenSim</Name>
     </ProjectReference>
   </ItemGroup>
diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs b/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs
index 0c4de02e13..b292d4316b 100644
--- a/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs
+++ b/OpenSim/Tools/OpenSim.32BitLaunch/Program.cs
@@ -44,7 +44,7 @@ namespace OpenSim._32BitLaunch
             System.Threading.Thread.Sleep(300);
             try
             {
-                OpenSim.Application.Main(args);
+                global::OpenSim.Application.Main(args);
             }
             catch (Exception ex)
             {
diff --git a/bin/OpenSim.32BitLaunch.exe b/bin/OpenSim.32BitLaunch.exe
index 70b46ae12487ac57645000e3eaa5a6fd07ddbae9..a028deb6187ea4f31cb131b9b0c58429f6cfa130 100755
GIT binary patch
delta 1005
zcmZ8gUr3Wt6#w13KhAB=&3{2^?Q4+VOy#R=khV}XR4kRIr6r`9>6rV|Hlqkqlc0wn
z*M(4!LI~2JUPjbgJr#jHDb$k~6qGMP6uoxtx9Otuaen9A-*@i0=bn4-bj@_l+#RL6
z|4%!zvI)*?%mUbnAS0zKwc=y9Q=4uFs)0^PH39Rclu~RT%0wo;K!s3vjTm56tXIqs
z&Wjax)~(SLDRKo46G{|dh!PuU%mA}c?3(D|#;J!H!Ufd{SP`e6G1aBJ2XpRl&K=3Q
zX0{WX3vky^3bjaP09T83yWywILp#ytXbI8!Dt^RsQ{(eHA^))0fNTJx`hZ^8F2G+#
z!#!Lr6&8c)*Erz02`rNRCH+7$9*m47WcZv3_(b)1`T`iw17r?QTVF>j*=scZCc=g)
zh0;-zGD^WHB`qM8zEp#FVMvr)af>Ionbv8C8L#<s?!Y=<CFZ;E8*7<egpARt`}`0V
z@R<9sgtxpAD>y@)$j2scB0NtO)WL=h!eU$`EZ5Pa;{lyNjB(-{b*59t0H%o<!BfHz
zUJ@qohVTa7qZP*KOqGx#0;Wn2quo&Vb@3u3xAvc`rl(9vu1!S8>La5`WNlqbG;%pO
zhW_wG#+!@}C!=v}4@Sk$ymRSOmXFLi^SjSkySwnj;@z%=W3hr|QE&CSE#<AB*Y~^n
z6}n~22*w-|ECx3m#ynOuAY#_Nu3Zd8Ez#KZcyMey=~hR);*~Ygy!{wttr5~Wy4iC!
z;B=rh;JbGP@1o(h*`sU9gMCke@<>`52D@XUkw7p!n2b+GLOv0;wH2w^TQ7HeT>9>m
zQpUCF^p@=l6As7KN~3%LSy^rYwq&xb7{!v~5xXRs3q7SxR0xB%^VQQqXyRGnn&Bjh
o#jNv)Nu>kvraw5#8AJN3tAY#7-jwgoJj|Ykw5#L?OKEw30n)OtCjbBd

delta 989
zcmZWoT}YE*6n@@!KhAA^Zf?@g`uWBnw_3yesjvidf-^J2u|)F1C2C9D#<v-ael&<k
zig3IImKPxzxvMU|g1U%6B7!cus9+Z&5(UwPc@cCMoo`#)MQ5DnJ?}Zsp6`5TXEXj8
z|J+UY>)FR$DA_tBW??44N(nkNld`!(%#dA|rDr~1Kufg)c|+FiunrfQUMlPqZtfR@
zte!c=HNw2eu>pCLDw>7JISjD6iAlmbx--BiqSgj+n(L?MiwQdvN+-QGzzpSJC5%?W
zkxFP}Wp0Ha`$@uU*A&3LwS{x7jpT;QY-7Sf>C#iQZ?=@;`7%YR2x1M`$EYRX6fA>i
ztE1+3bFWj_blx@_2Rv7S%XGfc;&57t#m7?`z1={QqHa8qFt$|znuez<(%ng?m+rsB
zl&;=Qax|Qx6B$nOE#z9PITx>VsX8MjcnC(^;a9jBkN5&N;)UqZA7FZs(I=);+=u(P
z#{*cz8G83>JmpP<XX&W{Sa6Kcfe4|ifF7y@u)mOR!Uc+t7V<p>4C5AMM(~_)0xN_m
zyeGVbPdE(yOtCX+u4DsZ(y%qVS7Hn56GNJdlcqs+$&_cdcN_T-Kk^}X<HYZcK>t!s
z+&23hdN3wwVA9Eu^i`}jB0ih<_#}qv-q?teNF~P7fXv_uCXyK?Hhw-WujJ%%O&Bbx
z4*XkPZFq6=PTICk3(z0#3_s{l-p<`sd(<zMug-77HQFG9twVju(ResEIh0nW;uDSH
zrKL++E$yiGCVzZFvhLuUzO37+Hd<GiNLt&4BwgGU(pI))--EypO|WDku_!%c%i?&A
zr~5iJ!_ZLvG~*n_Kr{U$3_&C?i6o-bZ-%xhO1II1N-ttGZiVV8@-d`Erskt=2rkiQ
hYpKgY#(xZT*5+dBvVA+RmWzKxTdQh!{$$yPs=op3vI_tJ

diff --git a/bin/OpenSim.32BitLaunch.pdb b/bin/OpenSim.32BitLaunch.pdb
index f532ee21e4058ae89d531ac5d8e0a4583bf10798..0af0597717d8643893e243d5fd98507c772e295d 100644
GIT binary patch
delta 519
zcmZ|MJxD@P6bJBo%_vPtAEpwoFMIi2R+edn;8YD!fr^8rQHxMS6d^4>aA>RGLQs@M
zLxDqBZ^$Xyq-bksYHX|qp`fAqKhd#!Iq!Gx;c_0FBgVyeL8&&+#J(meA;h=0PD*R5
z6WPF1*Ma3CCGl#vQkNIbisz4?H<@T6G8T;RSD^w`<?viyIZ3b6D5#I=dpvBK(@~$a
zz~yO!d!M^J_1v>&!<_PWYbPcx8w!->Sc}nxZ^&q)NtQA$W&HAgu_$(}rWtp4HQ!B$
zC?5sb0IiUNHrNL35J4Q!3!N|sU2qDzVHozo2=u@>?1%G&WXSu+kC;GW0Er|Vgo_Zx
z#1%LM({LDOp%3oD5qJpw@CeFvj;o%)0P-rLCR)7El2A3Aa2pXt$Y*wIYNURtWa?F1
zw{|G$hSb?!u2YF9P^l>KmT#(fYhq?0teHh4<X#kCN9`;vjB9EQBP71b?gSp4eG$Bs
XVU+(JD&wsoc}ms?N(ISbf3E)nhe37F

delta 473
zcmZ|MKP&@L90&0C>WcpVcm1OpnyMn&kXkxejwT%%ibzo{64JyVkxmTa5=)shuc0g^
zi$!^Zp@YOAjnyELScJsH&_u$3?@5i`CHHyvegE=)C#U6fS<t#Jw~u3#5OO$_yWTDG
zIDgbViO&lr?$HJXvtj<Ca@F{~WtQ)gD-+SonN+5l5~eGy#4TpMiiVk`vyY8f%{0vC
ztS7W76W>{lWvk32jtlSkj|yKB%aoRw-O-D;<mjR)w(MBk3@YcMQ9OTpI`QqT=gox3
zN>>B*Pz#lD9rQtDatIn=1RCKmG{I45feC1ZNoa#p@b&FWo*`tKhzL>$>~I!3U>4#K
zIR{;E1Gd0CbVCMPVG$}D?bY3f9^@LLWv9*#+RtyDAyr{af9`G<=sNed)fx&3wScvR
zdwic%b)aT0|D-;OD=N2qi5wZ(ntza%3X+Xg{UU1h;2-!cZ|&dT#5@5>se9mtQWx*(
HzEl4IZKrWZ