diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /share/32BitLaunch/Robust.32BitLaunch | |
parent | Add a build script. (diff) | |
download | opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to '')
-rwxr-xr-x | share/32BitLaunch/Robust.32BitLaunch.exe | bin | 5632 -> 0 bytes | |||
-rw-r--r-- | share/32BitLaunch/Robust.32BitLaunch/Program.cs | 23 | ||||
-rw-r--r-- | share/32BitLaunch/Robust.32BitLaunch/Robust32.sln | 22 | ||||
-rw-r--r-- | share/32BitLaunch/Robust.32BitLaunch/app.config | 72 |
4 files changed, 95 insertions, 22 deletions
diff --git a/share/32BitLaunch/Robust.32BitLaunch.exe b/share/32BitLaunch/Robust.32BitLaunch.exe deleted file mode 100755 index affedb4..0000000 --- a/share/32BitLaunch/Robust.32BitLaunch.exe +++ /dev/null | |||
Binary files differ | |||
diff --git a/share/32BitLaunch/Robust.32BitLaunch/Program.cs b/share/32BitLaunch/Robust.32BitLaunch/Program.cs index 490414c..ec5943e 100644 --- a/share/32BitLaunch/Robust.32BitLaunch/Program.cs +++ b/share/32BitLaunch/Robust.32BitLaunch/Program.cs | |||
@@ -26,35 +26,14 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using log4net; | ||
30 | 29 | ||
31 | namespace Robust._32BitLaunch | 30 | namespace Robust32 |
32 | { | 31 | { |
33 | class Program | 32 | class Program |
34 | { | 33 | { |
35 | static void Main(string[] args) | 34 | static void Main(string[] args) |
36 | { | 35 | { |
37 | log4net.Config.XmlConfigurator.Configure(); | ||
38 | |||
39 | System.Console.WriteLine("32-bit OpenSim executor"); | ||
40 | System.Console.WriteLine("-----------------------"); | ||
41 | System.Console.WriteLine(""); | ||
42 | System.Console.WriteLine("This application is compiled for 32-bit CPU and will run under WOW32 or similar."); | ||
43 | System.Console.WriteLine("All 64-bit incompatibilities should be gone."); | ||
44 | System.Console.WriteLine(""); | ||
45 | System.Threading.Thread.Sleep(300); | ||
46 | try | ||
47 | { | ||
48 | global::OpenSim.Server.OpenSimServer.Main(args); | 36 | global::OpenSim.Server.OpenSimServer.Main(args); |
49 | } | ||
50 | catch (Exception ex) | ||
51 | { | ||
52 | System.Console.WriteLine("OpenSim threw an exception:"); | ||
53 | System.Console.WriteLine(ex.ToString()); | ||
54 | System.Console.WriteLine(""); | ||
55 | System.Console.WriteLine("Application will now terminate!"); | ||
56 | System.Console.WriteLine(""); | ||
57 | } | ||
58 | } | 37 | } |
59 | } | 38 | } |
60 | } | 39 | } |
diff --git a/share/32BitLaunch/Robust.32BitLaunch/Robust32.sln b/share/32BitLaunch/Robust.32BitLaunch/Robust32.sln new file mode 100644 index 0000000..368b3ca --- /dev/null +++ b/share/32BitLaunch/Robust.32BitLaunch/Robust32.sln | |||
@@ -0,0 +1,22 @@ | |||
1 | | ||
2 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
3 | # Visual Studio 14 | ||
4 | VisualStudioVersion = 14.0.25420.1 | ||
5 | MinimumVisualStudioVersion = 10.0.40219.1 | ||
6 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust32", "Robust32.csproj", "{A159489E-6552-4734-8EFA-8E031F63C7F6}" | ||
7 | EndProject | ||
8 | Global | ||
9 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
10 | Debug|x86 = Debug|x86 | ||
11 | Release|x86 = Release|x86 | ||
12 | EndGlobalSection | ||
13 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
14 | {A159489E-6552-4734-8EFA-8E031F63C7F6}.Debug|x86.ActiveCfg = Debug|x86 | ||
15 | {A159489E-6552-4734-8EFA-8E031F63C7F6}.Debug|x86.Build.0 = Debug|x86 | ||
16 | {A159489E-6552-4734-8EFA-8E031F63C7F6}.Release|x86.ActiveCfg = Release|x86 | ||
17 | {A159489E-6552-4734-8EFA-8E031F63C7F6}.Release|x86.Build.0 = Release|x86 | ||
18 | EndGlobalSection | ||
19 | GlobalSection(SolutionProperties) = preSolution | ||
20 | HideSolutionNode = FALSE | ||
21 | EndGlobalSection | ||
22 | EndGlobal | ||
diff --git a/share/32BitLaunch/Robust.32BitLaunch/app.config b/share/32BitLaunch/Robust.32BitLaunch/app.config new file mode 100644 index 0000000..ca3ee0e --- /dev/null +++ b/share/32BitLaunch/Robust.32BitLaunch/app.config | |||
@@ -0,0 +1,72 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <configuration> | ||
3 | <configSections> | ||
4 | <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> | ||
5 | </configSections> | ||
6 | <startup> | ||
7 | <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" /> | ||
8 | </startup> | ||
9 | <runtime> | ||
10 | <loadFromRemoteSources enabled="true" /> | ||
11 | </runtime> | ||
12 | <appSettings> | ||
13 | <add key="ClientSettingsProvider.ServiceUri" value="" /> | ||
14 | </appSettings> | ||
15 | <log4net> | ||
16 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> | ||
17 | <filter type="log4net.Filter.LoggerMatchFilter"> | ||
18 | <loggerToMatch value="special" /> | ||
19 | <acceptOnMatch value="false" /> | ||
20 | </filter> | ||
21 | <layout type="log4net.Layout.PatternLayout"> | ||
22 | <conversionPattern value="%date{HH:mm:ss} - %message" /> | ||
23 | </layout> | ||
24 | </appender> | ||
25 | <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender: | ||
26 | <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> | ||
27 | <file value="log/Robust.log" /> | ||
28 | <rollingStyle value="Date" /> | ||
29 | <datePattern value="'.'yyyy-MM-dd"/> | ||
30 | ... | ||
31 | --> | ||
32 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | ||
33 | <file value="Robust.log" /> | ||
34 | <appendToFile value="true" /> | ||
35 | <filter type="log4net.Filter.LoggerMatchFilter"> | ||
36 | <loggerToMatch value="special" /> | ||
37 | <acceptOnMatch value="false" /> | ||
38 | </filter> | ||
39 | <layout type="log4net.Layout.PatternLayout"> | ||
40 | <conversionPattern value="%date %-5level - %logger %message%newline" /> | ||
41 | </layout> | ||
42 | </appender> | ||
43 | <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender"> | ||
44 | <file value="RobustStats.log" /> | ||
45 | <appendToFile value="true" /> | ||
46 | <layout type="log4net.Layout.PatternLayout"> | ||
47 | <conversionPattern value="%date - %message%newline" /> | ||
48 | </layout> | ||
49 | </appender> | ||
50 | <root> | ||
51 | <level value="DEBUG" /> | ||
52 | <appender-ref ref="Console" /> | ||
53 | <appender-ref ref="LogFileAppender" /> | ||
54 | </root> | ||
55 | <!-- used for stats recording --> | ||
56 | <logger name="special.StatsLogger"> | ||
57 | <appender-ref ref="StatsLogFileAppender" /> | ||
58 | </logger> | ||
59 | </log4net> | ||
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 | ||