From 08659811c7d8aeb229c95c0437d509367e59550d Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Sun, 11 Jun 2017 13:04:34 +0100
Subject: [PATCH] put back opensim 32bit launcher, renamed as OpenSim32.exe.
 This allows opensim to run in 32bit mode on 64bit machines. Possible most
 opensim regions should be running like this. 2GB of Virtual memory is still a
 lot on memory

---
 bin/OpenSim.32BitLaunch.exe.config            |  75 ------------------
 bin/OpenSim32.exe                             | Bin 0 -> 5632 bytes
 bin/OpenSim32.exe.config                      |  75 ++++++++++++++++++
 ...{OpenSim.32BitLaunch.pdb => OpenSim32.pdb} | Bin 11776 -> 11776 bytes
 4 files changed, 75 insertions(+), 75 deletions(-)
 delete mode 100644 bin/OpenSim.32BitLaunch.exe.config
 create mode 100644 bin/OpenSim32.exe
 create mode 100644 bin/OpenSim32.exe.config
 rename bin/{OpenSim.32BitLaunch.pdb => OpenSim32.pdb} (71%)

diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config
deleted file mode 100644
index 5b7807a8e3..0000000000
--- a/bin/OpenSim.32BitLaunch.exe.config
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-  </configSections>
-  <runtime>
-    <loadFromRemoteSources enabled="true" />
-    <gcConcurrent enabled="true" />
-	<gcServer enabled="true" />
-  </runtime>
-  <appSettings>
-  </appSettings>
-  <log4net>
-    <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
-      <filter type="log4net.Filter.LoggerMatchFilter">
-        <loggerToMatch value="special"/>
-        <acceptOnMatch value="false"/>
-      </filter>
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message" />
-        <!-- console log with milliseconds.  Useful for debugging -->
-<!--        <conversionPattern value="%date{HH:mm:ss.fff} - %message" /> -->
-      </layout>
-    </appender>
-
-<!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
-    <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <file value="log/OpenSim.32BitLaunch.log" />
-      <rollingStyle value="Date" />
-      <datePattern value="'.'yyyy-MM-dd"/>
-      ...
--->
-
-    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSim.32BitLaunch.log" />
-      <appendToFile value="true" />
-      <filter type="log4net.Filter.LoggerMatchFilter">
-        <loggerToMatch value="special"/>
-        <acceptOnMatch value="false"/>
-      </filter>
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date %-5level - %logger %message%newline" />
-      </layout>
-    </appender>
-
-    <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSimStats.log"/>
-      <appendToFile value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date - %message%newline" />
-      </layout>
-    </appender>
-
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="Console" />
-      <appender-ref ref="LogFileAppender" />
-    </root>
-
-    <!-- Independently control logging level for XEngine -->
-    <logger name="OpenSim.Region.ScriptEngine.XEngine">
-      <level value="INFO"/>
-    </logger>
-
-    <!-- Independently control logging level for per region module loading -->
-    <logger name="OpenSim.ApplicationPlugins.RegionModulesController.RegionModulesControllerPlugin">
-      <level value="INFO"/>
-    </logger>
-
-    <!-- used for stats recording -->
-    <logger name="special.StatsLogger">
-      <appender-ref ref="StatsLogFileAppender"/>
-    </logger>
-  </log4net>
-</configuration>
diff --git a/bin/OpenSim32.exe b/bin/OpenSim32.exe
new file mode 100644
index 0000000000000000000000000000000000000000..74477c0b68bdcfdf8ef6849b680529939c90b3cd
GIT binary patch
literal 5632
zcmeHLU2I%O6+W|ZT*o1fQ<|UVr%X11+O2)P_HG<I*vZ;nCvj@Wu6JVytkm4SJ6_-9
z{%r5h*2@EOp+%~A2@gCJMIhcQ1QLkwQ;<L)9;kS#lozBt0xuC#r3zHFd^7jn-F2MO
zzP9SD=iD>rZ_YV0cjjC#eeE{wBBCzz4?ZBei>GXP1^++T0=w@EzwV=-?|JLwUAFkv
z$<l`D^SbBOJl*Do?l^A1D}sBW!%c@5mW$kWt3uniulICpdS#wyk?o?(C#SC`v)!i@
z+siUUy`adBc5x7Zqvz2j;CQ4Wzkw<L<&(D1L6>b8<zFT0SAXqiJd8x>odKd{iRX!i
zx?^JJ;|9^^F#he+M8`YnABA(Go(`EFj4yYLwLokJ7%%Pt08hmk`;C!moalz;`JRE1
z@+}WU8kG)pv^>1mJYl&IRID3dN?T8$ceFgwY{yWc12V5@(zg`trW>57{Fuxg5hHq3
zM!@;-_Ec)%0D^f2&&TC+ws>WhNlR$bw?<COXxU75bW&1wlO^f!_0%_sHu3z6#EXGv
zIyGNP<abAFd+J(|3c#_Nbn4Qzg#w->jC-W~tmRguFdByJ(lsKPR{Af?(jgUxN(Fc-
zEz%n}NBhwwF1zGm_p`{;ZW?BKs+)eG;5?0__S4G{=_Z>FgWk_1{I|kiR``;F>k7W2
z=+|i$GA9(gt0+IBKeKLl{C&{hCJCRVyMRAS{e$(=d+dRle6R8(%2_|%heu2BkkJa4
zjPKFAjAQgwHTuqxLFh~08Qo6pp}`cR1AyK1Bw#NM0`}9Wf|Cl)D7c{D^9o*9PzO9n
zrovxTu&Ll{fJZT_wE1H-_v;FOn!ZgerO{sc8)@`;x(9fS-UU1bXEa2%A23VL0)ClB
z0q1BL@Hx5(SXA_{D`?QSK)FS40Q&SR)`KjMP}dfM!YVR)qbRXxmE<Xvv@f-`x0L#0
zBcew+1ioAsPSLcpV>GqoRzpjiC)+n%&oV1?DKx7y0XA7B3<O<s8p1QzO}%1?IUG-I
zPC-<{T20d1v^m#aGktR#ZN~S7U9p-aGw2j;kv+XCY~8!nwo=l)ng}l9m=rI$os2~1
zqG^dW;rXWPw6%)D2t6}st_aUI{q4L&an5zt&06T`!8X-|T@b$Enf2{V#8fverLih3
zeN$n6d)`EO#X}~IU?*eFtv5Zhw(&@oUDusvTW2+N0@FsOK@ZG|X(6CCx3z4V*c4Q3
z`hl>uSVfByg0q3(io9fEiDb2DNjDvusn;#jP(e_VvKd2$+%hQEEfG;PBXGThUNH5V
z<NASV_z5YQd%+2W=hlnDYnX=E!H!ZWycR#&J8%`d58_zwmQLc6)?P=SmMb^mQ8H^H
zqBgaD{7>1VKlx|=cYpoQ`@`>Cd6T+0V?DcY4D1GS;D8+VNsv<Gncc+LiN2m+extnh
zWbXcJTR+s;)+=!;6T_WzYYDOKPisMjc=FZ^@i_g{@(9Ooh|h&q5PD+T5n<rz)(~F_
zE6DtFqFHip31_-;_N;!!I5R#vnazpJ#N<I%O7$0SnRQsg3l}XB>tXRt`IJ27N~uF%
z@$~vt*O}imgxaX34bOeamvYf5-N$H8Yo8DuV{|AU^6c2G8Sq6tbc_w*;et^|>Ip_i
zHiDpjZe+y8vEZ9_h~4gbn(Nhwjxsv9O~0*vn9<{{z0C)VK|YqrOb`t+I(;T{c1%o;
zP7deB^~!MWtQa4j(8sgGnTgTNM0PA^7}a&$ZHyipjq*iwiP2H*>U^p7-VY@ymDeI-
z?|Y)fDwuxV(wkRtLi9@=-s13FS9D9s&5_hiGBd|PzK1&H9xlJtVxjnp=No@N_TBQ8
z+i(Bj^~~k_ccj+bx$;cIbkxgH4ul^d8D)P%_e5FcE{eU}N^jY%+$?WSjF)jR2;CQL
zj#jT$qz9k8c08_mr03%j=Mvl5lG-TZyfEi_^P57QFzTHULaSP`enI8@MdEpdeX>DH
z)mI!<^brKI5>?Y3Aw^XQUVyC*BG70*K15V>$=Uc2`5|2AxAR1IWU(2yJG*kg)=(k5
z060&pz!p%UU&VL<@M2W0)0<rn-jC*u=1zRL5ZjTJLc)njR8X`v(#eAz6Sb#+O^4RW
zRU)TJYL&p%LG{7cDS(`dQPh6g^&Va{2A={*nV{DmVd<Wd$x!mkQ3W`@VdyY)=U~sq
zPe41sEb{xKu0};zw27l?8bhIOg3D<UK7^1okVSzxWm`pcm)NN*Uz^B`u53#F1~dcM
zJcl}J1hYlfePun2qjF(O1J6SQvQ6OwgtcNRU@jkX${6dg)y~0oU!|vn*m^p2*OZ@f
zwj^((m?_iha;`qe%ghH#)`9O<M+7_P&>**oPILveCPP*P{FYiWn{{d`Pirc2oN+s7
zoCXlhAo4k;Rs}m4?HO3=v=yy<6}D~I_E3|mPY@+rP(Clm^T?H#vnRVqj^v6yyp}RQ
zZQmF1F@icCHe9M=RSm@7xo+Fz?%W4EcR^0&e7miOGyibj^Y{W|G=r#o6=MYvG?9~s
z_2gPjqD%cTz?{k&)(tPvznDsg0uO%k`>6|?w#6G!p*o$$O_%1vG2AK&pXv0q(#7G4
zH1`ADsp^*Ni0O1w_~{Gh_x0}Uozml~nZtzRPp3oAIp^crwsn8lHVx19-SuGDaP4!t
zZ)=UwG`DrfT*sZ2+?r}W7~{NUY@sSpUIxu=KFRwx%^h5&)9IyVM|r5}^?G_FvJiNo
zA1pZQ?#J|JEUok~w;z|~@fZ|OycohyQC;!O1}gcQ@IR*2Y+{w8we8^IF+y3vE{cY*
zxFz9qTK5;61}ZHt%|mm>Kv{}3uIrXB;-Hj~kw<uwxIVJY_o<Oq5+E=&lC04A_L_f&
ZeabSxqyNiXR{xLrl*RU0I3JmT{{g6_c+>y@

literal 0
HcmV?d00001

diff --git a/bin/OpenSim32.exe.config b/bin/OpenSim32.exe.config
new file mode 100644
index 0000000000..95b4a10a8b
--- /dev/null
+++ b/bin/OpenSim32.exe.config
@@ -0,0 +1,75 @@
+<configuration>
+    <configSections>
+        <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
+    </configSections>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+    </startup>
+    <runtime>
+        <loadFromRemoteSources enabled="true" />
+    </runtime>
+    <appSettings>
+    </appSettings>
+    <log4net>
+        <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
+            <filter type="log4net.Filter.LoggerMatchFilter">
+                <loggerToMatch value="special"/>
+                <acceptOnMatch value="false"/>
+            </filter>
+            <layout type="log4net.Layout.PatternLayout">
+                <conversionPattern value="%date{HH:mm:ss} - %message" />
+                <!-- console log with milliseconds.  Useful for debugging -->
+                <!--        <conversionPattern value="%date{HH:mm:ss.fff} - %message" /> -->
+            </layout>
+        </appender>
+
+        <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
+    <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
+      <file value="log/OpenSim.32BitLaunch.log" />
+      <rollingStyle value="Date" />
+      <datePattern value="'.'yyyy-MM-dd"/>
+      ...
+-->
+
+        <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
+            <file value="OpenSim.32BitLaunch.log" />
+            <appendToFile value="true" />
+            <filter type="log4net.Filter.LoggerMatchFilter">
+                <loggerToMatch value="special"/>
+                <acceptOnMatch value="false"/>
+            </filter>
+            <layout type="log4net.Layout.PatternLayout">
+                <conversionPattern value="%date %-5level - %logger %message%newline" />
+            </layout>
+        </appender>
+
+        <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
+            <file value="OpenSimStats.log"/>
+            <appendToFile value="true" />
+            <layout type="log4net.Layout.PatternLayout">
+                <conversionPattern value="%date - %message%newline" />
+            </layout>
+        </appender>
+
+        <root>
+            <level value="DEBUG" />
+            <appender-ref ref="Console" />
+            <appender-ref ref="LogFileAppender" />
+        </root>
+
+        <!-- Independently control logging level for XEngine -->
+        <logger name="OpenSim.Region.ScriptEngine.XEngine">
+            <level value="INFO"/>
+        </logger>
+
+        <!-- Independently control logging level for per region module loading -->
+        <logger name="OpenSim.ApplicationPlugins.RegionModulesController.RegionModulesControllerPlugin">
+            <level value="INFO"/>
+        </logger>
+
+        <!-- used for stats recording -->
+        <logger name="special.StatsLogger">
+            <appender-ref ref="StatsLogFileAppender"/>
+        </logger>
+    </log4net>
+</configuration>
\ No newline at end of file
diff --git a/bin/OpenSim.32BitLaunch.pdb b/bin/OpenSim32.pdb
similarity index 71%
rename from bin/OpenSim.32BitLaunch.pdb
rename to bin/OpenSim32.pdb
index 5083dd5df55f3252aafaf38f604cb826b7012cc0..86d30585312f8965c7db582a8c58516fa7ad72df 100644
GIT binary patch
delta 951
zcmZpOX^5Gi!&tFV_c<#UAH)CuEDQ`laudfR#z{OPT>PjaTr3hEinfuAKs8$f%kD~d
z$9PS+dT6GB$AdYOWw>Nm?gSb$ZdPPF0@N$R{Qp1mW_g~6NNhnSoi}0<|KnB(__lw~
z_e^d!Ne}@V1p@Ul>9cx#B&?O~n9TN_e0Zql^YP;w9oH~&vP0w<*f$Fbd}pk$0&$(K
zVjRmd^Abxk^Yda#Qj1H9Gjn5#GZKqZV~mZQGE00COY@R5V*CqI^MW&Tjg4Xgit^Ko
z5_9#Eiy0V_tzr^!YEH^5$$@Cj2Wkcy3)EbI(98mIt}PIQLck7)L4bLqV=Ch$5f1jk
z_memlKDsoSU&K}wqyPj!iZp;&`jG)+&)n=OF+es*4rGYk=0cI#jGPmIOb}q7EGnkX
z8UbcGiiuC|5i_u70`fr0nHbm@J^^V1AO-<OAcTbsNR0|u6ihd;0okey3=O;tCYzZh
zEEzXR$+IvrY*vu_#LPA4KS&|S#LY5FPZ%e0u}I>I(9FrQYR0-G1=ZvRH3<W0kPSef
z1jHObEC|FPr*Z)?$Y~(J3ZWQ4>1Cs%HRB`|9!YKnhCUvK{y1Ks94M3&fLI5JJtnKF
z*amSiOaZb%zypXu9zX{0nAU^FG=rgmo1v?jfe8bH?k>HLj12oh=^7qn3_$+m11d6%
z?33@Rs9BJkm?qn+s_<|Evj_}KbX*wA2ed~4h>rrX1rWyr9SfpCU>*=R05Qmapj7b!
oh;@MR=K#b$KsGZF3jr}GoP>cG7H+_>0f!~$=17gjjEl5b0BY9gJpcdz

literal 11776
zcmeHM?`vCC7=F{%Eoqu=>9o2{C7Yew+Io|=nx<9O+O$Hjq1CLVN+eCQ)P^RxBgxe1
z2k#W-K8WmtARSIn#{~VT=un46N^v3xPWK1+K~!*cBC=1d&vSotL8Ky`lBM@;pFHQB
z`<`>peb0N(kM~A1se)Qmr%S%DKit;li^d-Ebt{2@r+&v^OdvJ-zubysiFwE^2HC$=
zV1fA+TQ;%<LSlQsMjn6nmmQ7}=drCOKpt6HsRP$)__3v`El^w4PiH^eKUv^arNeQ;
z*AsC-aUk;Cxnu6#1FwaZ&yH{V(QVb`HNuwav%ufY|6C8t=YQt;<bUPrv&P1IqN`Jn
z^et|_=sg*e`H{D4-dq@Zc<!ekzVV*yGxF}!#~=4jU-X`D6}jq+oS!_K@BjMH3&S7&
zI`HkW!aH-^Hc;MedF$NSum1Sx`SHZq{RhTwH%jf_8^r=|m>sqFM(MZR&-Gbgd1-lx
zYrDo~!oBg4!|8l1lZ%%MNAk15)$Bo4%@(bk($zVTDGeu&<Wn>8(SrJ9A(>NBMUhl*
zTt)rjwfd`By}p@4{i#eTYt%n{tv=VBe&9iX!hYHNQ{5E*+0V}J0}c(X4}I74z@_mE
zj(@w)qdr1}`dE=E9KU@4+g^F<rHKiosn-wiS{ksWGAzJ%PLWnGd$VA6seBE<xNTxF
z$4{ckOdixMwO-bH8L)JDy<S?pW3i*fQaY#W+>5dkKrb)}P^VdZ`n{0W8AXzQhCZ}O
zN2k=)UFiFH@%_gxMLyl*s`=!-4<@M-l|ktQ*P$Zs&3%V4H#qcqzabyu4ImEuS^c^V
z`F6AXE=+SwwtzQ-?*=!4_k!;L!)G=6?S60<7+W6g0Jset0k?w>f)(%>*bk0_1K=mX
zmzS2c1h@nFNih1WCBbM*%YtDK4Ua1KfnNj%!LNY3!E@jc_!OA!yl(Poa1Y8|u&xIh
z9=t&YTEWi(;{ekEpb<u;P9thDj<d@wi=ey*P=Kh;mJapU_U~XPV46x#`;g}t+ETq1
z;F)fR%YTLMQv)XOU10hEe00?pkX)De)~Idy+ZrnNr3$b>Lk0A~?!xuAz@5@)t;bmB
z!z0nQ#8AFeIGPw$Gx?Gfnq-fDoolYc+yFGo{<5+_FhIegSB1hQ(H7eRRciqs)_lI(
zWuh_t=yuVpy#ZeWC-k^hZ?N^c>fe8k@zbsj{oG%V<C<IcE;h(7?iq}=55Sp6h5<{O
zk=U+hF3($K#@B)J?*rBqvP-@&v!iex`p?$R&v%+dV#b@4L|IHpF=I;7-8C2thJrZ%
z$UPq`S1jMN&UPX>s~MaDYs8}~I99(?P>+5~;d5Hd^P%O*>kWBX@iX(*yoDjWp&?HF
z=0@7OS~0xV_dlLl{ll63Y$QLeia(#srHkS(7E=D1bn;NTFqKtPvqr&mCYvt$uS5Kg
z!3NrrF#`%W8Z3iv%1r=;^VM#EXLwuIX8{kYGe)uiApRh#?#Lo%kk)_+U?0$e_oyA{
z2RI)v_OcD&*f56T0yst-6DPor#|;46XEcK2$TQ{^z?RCfz|ED@6}u<41#Aoa&ldO-
D<QQ&F