diff options
author | UbitUmarov | 2017-06-11 13:04:34 +0100 |
---|---|---|
committer | UbitUmarov | 2017-06-11 13:04:34 +0100 |
commit | 08659811c7d8aeb229c95c0437d509367e59550d (patch) | |
tree | 06cbc3d31a0c639b9e58fd9a4643a4f2435a0b23 /bin | |
parent | add a adicional in transit flag to signal HG tps, and use it to ignore userna... (diff) | |
download | opensim-SC-08659811c7d8aeb229c95c0437d509367e59550d.zip opensim-SC-08659811c7d8aeb229c95c0437d509367e59550d.tar.gz opensim-SC-08659811c7d8aeb229c95c0437d509367e59550d.tar.bz2 opensim-SC-08659811c7d8aeb229c95c0437d509367e59550d.tar.xz |
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
Diffstat (limited to 'bin')
-rw-r--r-- | bin/OpenSim.32BitLaunch.exe.config | 75 | ||||
-rw-r--r-- | bin/OpenSim32.exe | bin | 0 -> 5632 bytes | |||
-rw-r--r-- | bin/OpenSim32.exe.config | 75 | ||||
-rw-r--r-- | bin/OpenSim32.pdb (renamed from bin/OpenSim.32BitLaunch.pdb) | bin | 11776 -> 11776 bytes |
4 files changed, 75 insertions, 75 deletions
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 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" ?> | ||
2 | <configuration> | ||
3 | <configSections> | ||
4 | <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> | ||
5 | </configSections> | ||
6 | <runtime> | ||
7 | <loadFromRemoteSources enabled="true" /> | ||
8 | <gcConcurrent enabled="true" /> | ||
9 | <gcServer enabled="true" /> | ||
10 | </runtime> | ||
11 | <appSettings> | ||
12 | </appSettings> | ||
13 | <log4net> | ||
14 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> | ||
15 | <filter type="log4net.Filter.LoggerMatchFilter"> | ||
16 | <loggerToMatch value="special"/> | ||
17 | <acceptOnMatch value="false"/> | ||
18 | </filter> | ||
19 | <layout type="log4net.Layout.PatternLayout"> | ||
20 | <conversionPattern value="%date{HH:mm:ss} - %message" /> | ||
21 | <!-- console log with milliseconds. Useful for debugging --> | ||
22 | <!-- <conversionPattern value="%date{HH:mm:ss.fff} - %message" /> --> | ||
23 | </layout> | ||
24 | </appender> | ||
25 | |||
26 | <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender: | ||
27 | <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> | ||
28 | <file value="log/OpenSim.32BitLaunch.log" /> | ||
29 | <rollingStyle value="Date" /> | ||
30 | <datePattern value="'.'yyyy-MM-dd"/> | ||
31 | ... | ||
32 | --> | ||
33 | |||
34 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | ||
35 | <file value="OpenSim.32BitLaunch.log" /> | ||
36 | <appendToFile value="true" /> | ||
37 | <filter type="log4net.Filter.LoggerMatchFilter"> | ||
38 | <loggerToMatch value="special"/> | ||
39 | <acceptOnMatch value="false"/> | ||
40 | </filter> | ||
41 | <layout type="log4net.Layout.PatternLayout"> | ||
42 | <conversionPattern value="%date %-5level - %logger %message%newline" /> | ||
43 | </layout> | ||
44 | </appender> | ||
45 | |||
46 | <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender"> | ||
47 | <file value="OpenSimStats.log"/> | ||
48 | <appendToFile value="true" /> | ||
49 | <layout type="log4net.Layout.PatternLayout"> | ||
50 | <conversionPattern value="%date - %message%newline" /> | ||
51 | </layout> | ||
52 | </appender> | ||
53 | |||
54 | <root> | ||
55 | <level value="DEBUG" /> | ||
56 | <appender-ref ref="Console" /> | ||
57 | <appender-ref ref="LogFileAppender" /> | ||
58 | </root> | ||
59 | |||
60 | <!-- Independently control logging level for XEngine --> | ||
61 | <logger name="OpenSim.Region.ScriptEngine.XEngine"> | ||
62 | <level value="INFO"/> | ||
63 | </logger> | ||
64 | |||
65 | <!-- Independently control logging level for per region module loading --> | ||
66 | <logger name="OpenSim.ApplicationPlugins.RegionModulesController.RegionModulesControllerPlugin"> | ||
67 | <level value="INFO"/> | ||
68 | </logger> | ||
69 | |||
70 | <!-- used for stats recording --> | ||
71 | <logger name="special.StatsLogger"> | ||
72 | <appender-ref ref="StatsLogFileAppender"/> | ||
73 | </logger> | ||
74 | </log4net> | ||
75 | </configuration> | ||
diff --git a/bin/OpenSim32.exe b/bin/OpenSim32.exe new file mode 100644 index 0000000..74477c0 --- /dev/null +++ b/bin/OpenSim32.exe | |||
Binary files 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 @@ | |||
1 | <configuration> | ||
2 | <configSections> | ||
3 | <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> | ||
4 | </configSections> | ||
5 | <startup> | ||
6 | <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/> | ||
7 | </startup> | ||
8 | <runtime> | ||
9 | <loadFromRemoteSources enabled="true" /> | ||
10 | </runtime> | ||
11 | <appSettings> | ||
12 | </appSettings> | ||
13 | <log4net> | ||
14 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> | ||
15 | <filter type="log4net.Filter.LoggerMatchFilter"> | ||
16 | <loggerToMatch value="special"/> | ||
17 | <acceptOnMatch value="false"/> | ||
18 | </filter> | ||
19 | <layout type="log4net.Layout.PatternLayout"> | ||
20 | <conversionPattern value="%date{HH:mm:ss} - %message" /> | ||
21 | <!-- console log with milliseconds. Useful for debugging --> | ||
22 | <!-- <conversionPattern value="%date{HH:mm:ss.fff} - %message" /> --> | ||
23 | </layout> | ||
24 | </appender> | ||
25 | |||
26 | <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender: | ||
27 | <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> | ||
28 | <file value="log/OpenSim.32BitLaunch.log" /> | ||
29 | <rollingStyle value="Date" /> | ||
30 | <datePattern value="'.'yyyy-MM-dd"/> | ||
31 | ... | ||
32 | --> | ||
33 | |||
34 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | ||
35 | <file value="OpenSim.32BitLaunch.log" /> | ||
36 | <appendToFile value="true" /> | ||
37 | <filter type="log4net.Filter.LoggerMatchFilter"> | ||
38 | <loggerToMatch value="special"/> | ||
39 | <acceptOnMatch value="false"/> | ||
40 | </filter> | ||
41 | <layout type="log4net.Layout.PatternLayout"> | ||
42 | <conversionPattern value="%date %-5level - %logger %message%newline" /> | ||
43 | </layout> | ||
44 | </appender> | ||
45 | |||
46 | <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender"> | ||
47 | <file value="OpenSimStats.log"/> | ||
48 | <appendToFile value="true" /> | ||
49 | <layout type="log4net.Layout.PatternLayout"> | ||
50 | <conversionPattern value="%date - %message%newline" /> | ||
51 | </layout> | ||
52 | </appender> | ||
53 | |||
54 | <root> | ||
55 | <level value="DEBUG" /> | ||
56 | <appender-ref ref="Console" /> | ||
57 | <appender-ref ref="LogFileAppender" /> | ||
58 | </root> | ||
59 | |||
60 | <!-- Independently control logging level for XEngine --> | ||
61 | <logger name="OpenSim.Region.ScriptEngine.XEngine"> | ||
62 | <level value="INFO"/> | ||
63 | </logger> | ||
64 | |||
65 | <!-- Independently control logging level for per region module loading --> | ||
66 | <logger name="OpenSim.ApplicationPlugins.RegionModulesController.RegionModulesControllerPlugin"> | ||
67 | <level value="INFO"/> | ||
68 | </logger> | ||
69 | |||
70 | <!-- used for stats recording --> | ||
71 | <logger name="special.StatsLogger"> | ||
72 | <appender-ref ref="StatsLogFileAppender"/> | ||
73 | </logger> | ||
74 | </log4net> | ||
75 | </configuration> \ No newline at end of file | ||
diff --git a/bin/OpenSim.32BitLaunch.pdb b/bin/OpenSim32.pdb index 5083dd5..86d3058 100644 --- a/bin/OpenSim.32BitLaunch.pdb +++ b/bin/OpenSim32.pdb | |||
Binary files differ | |||