aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--bin/OpenSim32.exebin0 -> 5632 bytes
-rw-r--r--bin/OpenSim32.exe.config75
-rw-r--r--bin/OpenSim32.pdb (renamed from bin/OpenSim.32BitLaunch.pdb)bin11776 -> 11776 bytes
-rw-r--r--bin/OpenSimDefaults.ini8
-rw-r--r--bin/Robust32.exebin0 -> 5632 bytes
-rw-r--r--bin/Robust32.exe.config (renamed from bin/OpenSim.32BitLaunch.exe.config)57
-rw-r--r--bin/Robust32.pdbbin0 -> 11776 bytes
-rw-r--r--bin/Robust32.vshost.exebin0 -> 22696 bytes
-rw-r--r--bin/Robust32.vshost.exe.config (renamed from bin/Robust.32BitLaunch.exe.config)45
-rwxr-xr-xbin/opensim-ode.sh4
-rwxr-xr-xbin/opensim.sh5
11 files changed, 134 insertions, 60 deletions
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..9224240
--- /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.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.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
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 7bfb32a..f7e2f5f 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -663,14 +663,6 @@
663 663
664 664
665[ClientStack.LindenUDP] 665[ClientStack.LindenUDP]
666 ; Set this to true to process incoming packets asynchronously. Networking is
667 ; already separated from packet handling with a queue, so this will only
668 ; affect whether networking internals such as packet decoding and
669 ; acknowledgement accounting are done synchronously or asynchronously
670 ; Default is true.
671 ;
672 ;async_packet_handling = true
673
674 ; The client socket receive buffer size determines how many 666 ; The client socket receive buffer size determines how many
675 ; incoming requests we can process; the default on .NET is 8192 667 ; incoming requests we can process; the default on .NET is 8192
676 ; which is about 2 4k-sized UDP datagrams. On mono this is 668 ; which is about 2 4k-sized UDP datagrams. On mono this is
diff --git a/bin/Robust32.exe b/bin/Robust32.exe
new file mode 100644
index 0000000..e5e4674
--- /dev/null
+++ b/bin/Robust32.exe
Binary files differ
diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/Robust32.exe.config
index 5b7807a..ca3ee0e 100644
--- a/bin/OpenSim.32BitLaunch.exe.config
+++ b/bin/Robust32.exe.config
@@ -1,75 +1,72 @@
1<?xml version="1.0" encoding="utf-8" ?> 1<?xml version="1.0" encoding="utf-8"?>
2<configuration> 2<configuration>
3 <configSections> 3 <configSections>
4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> 4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5 </configSections> 5 </configSections>
6 <startup>
7 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
8 </startup>
6 <runtime> 9 <runtime>
7 <loadFromRemoteSources enabled="true" /> 10 <loadFromRemoteSources enabled="true" />
8 <gcConcurrent enabled="true" />
9 <gcServer enabled="true" />
10 </runtime> 11 </runtime>
11 <appSettings> 12 <appSettings>
13 <add key="ClientSettingsProvider.ServiceUri" value="" />
12 </appSettings> 14 </appSettings>
13 <log4net> 15 <log4net>
14 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> 16 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
15 <filter type="log4net.Filter.LoggerMatchFilter"> 17 <filter type="log4net.Filter.LoggerMatchFilter">
16 <loggerToMatch value="special"/> 18 <loggerToMatch value="special" />
17 <acceptOnMatch value="false"/> 19 <acceptOnMatch value="false" />
18 </filter> 20 </filter>
19 <layout type="log4net.Layout.PatternLayout"> 21 <layout type="log4net.Layout.PatternLayout">
20 <conversionPattern value="%date{HH:mm:ss} - %message" /> 22 <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> 23 </layout>
24 </appender> 24 </appender>
25 25 <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
26<!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
27 <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> 26 <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
28 <file value="log/OpenSim.32BitLaunch.log" /> 27 <file value="log/Robust.log" />
29 <rollingStyle value="Date" /> 28 <rollingStyle value="Date" />
30 <datePattern value="'.'yyyy-MM-dd"/> 29 <datePattern value="'.'yyyy-MM-dd"/>
31 ... 30 ...
32--> 31-->
33
34 <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> 32 <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
35 <file value="OpenSim.32BitLaunch.log" /> 33 <file value="Robust.log" />
36 <appendToFile value="true" /> 34 <appendToFile value="true" />
37 <filter type="log4net.Filter.LoggerMatchFilter"> 35 <filter type="log4net.Filter.LoggerMatchFilter">
38 <loggerToMatch value="special"/> 36 <loggerToMatch value="special" />
39 <acceptOnMatch value="false"/> 37 <acceptOnMatch value="false" />
40 </filter> 38 </filter>
41 <layout type="log4net.Layout.PatternLayout"> 39 <layout type="log4net.Layout.PatternLayout">
42 <conversionPattern value="%date %-5level - %logger %message%newline" /> 40 <conversionPattern value="%date %-5level - %logger %message%newline" />
43 </layout> 41 </layout>
44 </appender> 42 </appender>
45
46 <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender"> 43 <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
47 <file value="OpenSimStats.log"/> 44 <file value="RobustStats.log" />
48 <appendToFile value="true" /> 45 <appendToFile value="true" />
49 <layout type="log4net.Layout.PatternLayout"> 46 <layout type="log4net.Layout.PatternLayout">
50 <conversionPattern value="%date - %message%newline" /> 47 <conversionPattern value="%date - %message%newline" />
51 </layout> 48 </layout>
52 </appender> 49 </appender>
53
54 <root> 50 <root>
55 <level value="DEBUG" /> 51 <level value="DEBUG" />
56 <appender-ref ref="Console" /> 52 <appender-ref ref="Console" />
57 <appender-ref ref="LogFileAppender" /> 53 <appender-ref ref="LogFileAppender" />
58 </root> 54 </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 --> 55 <!-- used for stats recording -->
71 <logger name="special.StatsLogger"> 56 <logger name="special.StatsLogger">
72 <appender-ref ref="StatsLogFileAppender"/> 57 <appender-ref ref="StatsLogFileAppender" />
73 </logger> 58 </logger>
74 </log4net> 59 </log4net>
75</configuration> 60 <system.web>
61 <membership defaultProvider="ClientAuthenticationMembershipProvider">
62 <providers>
63 <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
64 </providers>
65 </membership>
66 <roleManager defaultProvider="ClientRoleProvider" enabled="true">
67 <providers>
68 <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
69 </providers>
70 </roleManager>
71 </system.web>
72</configuration> \ No newline at end of file
diff --git a/bin/Robust32.pdb b/bin/Robust32.pdb
new file mode 100644
index 0000000..15a0d75
--- /dev/null
+++ b/bin/Robust32.pdb
Binary files differ
diff --git a/bin/Robust32.vshost.exe b/bin/Robust32.vshost.exe
new file mode 100644
index 0000000..681ab77
--- /dev/null
+++ b/bin/Robust32.vshost.exe
Binary files differ
diff --git a/bin/Robust.32BitLaunch.exe.config b/bin/Robust32.vshost.exe.config
index 0399a1b..ca3ee0e 100644
--- a/bin/Robust.32BitLaunch.exe.config
+++ b/bin/Robust32.vshost.exe.config
@@ -1,63 +1,72 @@
1<?xml version="1.0" encoding="utf-8" ?> 1<?xml version="1.0" encoding="utf-8"?>
2<configuration> 2<configuration>
3 <configSections> 3 <configSections>
4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> 4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5 </configSections> 5 </configSections>
6 <startup>
7 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
8 </startup>
6 <runtime> 9 <runtime>
7 <loadFromRemoteSources enabled="true" /> 10 <loadFromRemoteSources enabled="true" />
8 <gcConcurrent enabled="true" />
9 <gcServer enabled="true" />
10 </runtime> 11 </runtime>
11 <appSettings> 12 <appSettings>
13 <add key="ClientSettingsProvider.ServiceUri" value="" />
12 </appSettings> 14 </appSettings>
13 <log4net> 15 <log4net>
14 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> 16 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
15 <filter type="log4net.Filter.LoggerMatchFilter"> 17 <filter type="log4net.Filter.LoggerMatchFilter">
16 <loggerToMatch value="special"/> 18 <loggerToMatch value="special" />
17 <acceptOnMatch value="false"/> 19 <acceptOnMatch value="false" />
18 </filter> 20 </filter>
19 <layout type="log4net.Layout.PatternLayout"> 21 <layout type="log4net.Layout.PatternLayout">
20 <conversionPattern value="%date{HH:mm:ss} - %message" /> 22 <conversionPattern value="%date{HH:mm:ss} - %message" />
21 </layout> 23 </layout>
22 </appender> 24 </appender>
23 25 <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
24<!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
25 <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> 26 <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
26 <file value="log/Robust.32BitLaunch.log" /> 27 <file value="log/Robust.log" />
27 <rollingStyle value="Date" /> 28 <rollingStyle value="Date" />
28 <datePattern value="'.'yyyy-MM-dd"/> 29 <datePattern value="'.'yyyy-MM-dd"/>
29 ... 30 ...
30--> 31-->
31
32 <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> 32 <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
33 <file value="Robust.32BitLaunch.log" /> 33 <file value="Robust.log" />
34 <appendToFile value="true" /> 34 <appendToFile value="true" />
35 <filter type="log4net.Filter.LoggerMatchFilter"> 35 <filter type="log4net.Filter.LoggerMatchFilter">
36 <loggerToMatch value="special"/> 36 <loggerToMatch value="special" />
37 <acceptOnMatch value="false"/> 37 <acceptOnMatch value="false" />
38 </filter> 38 </filter>
39 <layout type="log4net.Layout.PatternLayout"> 39 <layout type="log4net.Layout.PatternLayout">
40 <conversionPattern value="%date %-5level - %logger %message%newline" /> 40 <conversionPattern value="%date %-5level - %logger %message%newline" />
41 </layout> 41 </layout>
42 </appender> 42 </appender>
43
44 <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender"> 43 <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
45 <file value="RobustStats.log"/> 44 <file value="RobustStats.log" />
46 <appendToFile value="true" /> 45 <appendToFile value="true" />
47 <layout type="log4net.Layout.PatternLayout"> 46 <layout type="log4net.Layout.PatternLayout">
48 <conversionPattern value="%date - %message%newline" /> 47 <conversionPattern value="%date - %message%newline" />
49 </layout> 48 </layout>
50 </appender> 49 </appender>
51
52 <root> 50 <root>
53 <level value="DEBUG" /> 51 <level value="DEBUG" />
54 <appender-ref ref="Console" /> 52 <appender-ref ref="Console" />
55 <appender-ref ref="LogFileAppender" /> 53 <appender-ref ref="LogFileAppender" />
56 </root> 54 </root>
57
58 <!-- used for stats recording --> 55 <!-- used for stats recording -->
59 <logger name="special.StatsLogger"> 56 <logger name="special.StatsLogger">
60 <appender-ref ref="StatsLogFileAppender"/> 57 <appender-ref ref="StatsLogFileAppender" />
61 </logger> 58 </logger>
62 </log4net> 59 </log4net>
63</configuration> 60 <system.web>
61 <membership defaultProvider="ClientAuthenticationMembershipProvider">
62 <providers>
63 <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
64 </providers>
65 </membership>
66 <roleManager defaultProvider="ClientRoleProvider" enabled="true">
67 <providers>
68 <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
69 </providers>
70 </roleManager>
71 </system.web>
72</configuration> \ No newline at end of file
diff --git a/bin/opensim-ode.sh b/bin/opensim-ode.sh
deleted file mode 100755
index 7c61571..0000000
--- a/bin/opensim-ode.sh
+++ /dev/null
@@ -1,4 +0,0 @@
1#!/bin/sh
2echo "Starting OpenSimulator with ODE or ubOde. If you get an error saying limit: Operation not permitted. Then you will need to chmod 0600 /etc/limits"
3ulimit -s 262144
4mono OpenSim.exe
diff --git a/bin/opensim.sh b/bin/opensim.sh
new file mode 100755
index 0000000..508d925
--- /dev/null
+++ b/bin/opensim.sh
@@ -0,0 +1,5 @@
1#!/bin/sh
2ulimit -s 1048576
3# next option may improve SGen gc (for opensim only) you may also need to increase nursery size on large regions
4#export MONO_GC_PARAMS="minor=split,promotion-age=14"
5mono --desktop OpenSim.exe