From 08659811c7d8aeb229c95c0437d509367e59550d Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sun, 11 Jun 2017 13:04:34 +0100
Subject: 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/OpenSim.32BitLaunch.pdb        | Bin 11776 -> 0 bytes
 bin/OpenSim32.exe                  | Bin 0 -> 5632 bytes
 bin/OpenSim32.exe.config           |  75 +++++++++++++++++++++++++++++++++++++
 bin/OpenSim32.pdb                  | Bin 0 -> 11776 bytes
 5 files changed, 75 insertions(+), 75 deletions(-)
 delete mode 100644 bin/OpenSim.32BitLaunch.exe.config
 delete mode 100644 bin/OpenSim.32BitLaunch.pdb
 create mode 100644 bin/OpenSim32.exe
 create mode 100644 bin/OpenSim32.exe.config
 create mode 100644 bin/OpenSim32.pdb

(limited to 'bin')

diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config
deleted file mode 100644
index 5b7807a..0000000
--- 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/OpenSim.32BitLaunch.pdb b/bin/OpenSim.32BitLaunch.pdb
deleted file mode 100644
index 5083dd5..0000000
Binary files a/bin/OpenSim.32BitLaunch.pdb and /dev/null differ
diff --git a/bin/OpenSim32.exe b/bin/OpenSim32.exe
new file mode 100644
index 0000000..74477c0
Binary files /dev/null and b/bin/OpenSim32.exe differ
diff --git a/bin/OpenSim32.exe.config b/bin/OpenSim32.exe.config
new file mode 100644
index 0000000..95b4a10
--- /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/OpenSim32.pdb b/bin/OpenSim32.pdb
new file mode 100644
index 0000000..86d3058
Binary files /dev/null and b/bin/OpenSim32.pdb differ
-- 
cgit v1.1