aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2010-04-14 11:06:07 -0700
committerJohn Hurliman2010-04-14 11:06:07 -0700
commit985faf415106a068bf59ccb2bc0bacfc8d705e90 (patch)
treef3e460cce48fff6082579610238140c290c7ab4d
parentApplying a patch from lkalif to fix a small bug in the previous patch (diff)
parent* Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine. (diff)
downloadopensim-SC_OLD-985faf415106a068bf59ccb2bc0bacfc8d705e90.zip
opensim-SC_OLD-985faf415106a068bf59ccb2bc0bacfc8d705e90.tar.gz
opensim-SC_OLD-985faf415106a068bf59ccb2bc0bacfc8d705e90.tar.bz2
opensim-SC_OLD-985faf415106a068bf59ccb2bc0bacfc8d705e90.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs6
-rw-r--r--OpenSim/Server/ServerMain.cs2
-rw-r--r--OpenSim/Tools/Robust.32BitLaunch/Program.cs60
-rw-r--r--OpenSim/Tools/Robust.32BitLaunch/Properties/AssemblyInfo.cs63
-rw-r--r--OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln20
-rw-r--r--bin/Robust.32BitLaunch.exebin0 -> 5632 bytes
-rw-r--r--bin/Robust.32BitLaunch.exe.config32
7 files changed, 179 insertions, 4 deletions
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 9d29480..1208b97 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -188,9 +188,9 @@ namespace OpenSim.Framework
188 m_textureEntry = DEFAULT_TEXTURE; 188 m_textureEntry = DEFAULT_TEXTURE;
189 } 189 }
190 190
191 /// <summary> 191 /// <summary>
192 /// Construct a PrimitiveBaseShape object from a OpenMetaverse.Primitive object 192 /// Construct a PrimitiveBaseShape object from a OpenMetaverse.Primitive object
193 /// </summary> 193 /// </summary>
194 /// <param name="prim"></param> 194 /// <param name="prim"></param>
195 public PrimitiveBaseShape(Primitive prim) 195 public PrimitiveBaseShape(Primitive prim)
196 { 196 {
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index 10cd9c5..d3e65a4 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Server
47 protected static List<IServiceConnector> m_ServiceConnectors = 47 protected static List<IServiceConnector> m_ServiceConnectors =
48 new List<IServiceConnector>(); 48 new List<IServiceConnector>();
49 49
50 static int Main(string[] args) 50 public static int Main(string[] args)
51 { 51 {
52 m_Server = new HttpServerBase("R.O.B.U.S.T.", args); 52 m_Server = new HttpServerBase("R.O.B.U.S.T.", args);
53 53
diff --git a/OpenSim/Tools/Robust.32BitLaunch/Program.cs b/OpenSim/Tools/Robust.32BitLaunch/Program.cs
new file mode 100644
index 0000000..490414c
--- /dev/null
+++ b/OpenSim/Tools/Robust.32BitLaunch/Program.cs
@@ -0,0 +1,60 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using log4net;
30
31namespace Robust._32BitLaunch
32{
33 class Program
34 {
35 static void Main(string[] args)
36 {
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);
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 }
59 }
60}
diff --git a/OpenSim/Tools/Robust.32BitLaunch/Properties/AssemblyInfo.cs b/OpenSim/Tools/Robust.32BitLaunch/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..cf80f47
--- /dev/null
+++ b/OpenSim/Tools/Robust.32BitLaunch/Properties/AssemblyInfo.cs
@@ -0,0 +1,63 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System.Reflection;
29using System.Runtime.CompilerServices;
30using System.Runtime.InteropServices;
31
32// General information about an assembly is controlled through the following
33// set of attributes. Change these attribute values to modify the information
34// associated with an assembly.
35[assembly: AssemblyTitle("Robust.32BitLaunch")]
36[assembly: AssemblyDescription("")]
37[assembly: AssemblyConfiguration("")]
38[assembly: AssemblyCompany("http://opensimulator.org")]
39[assembly: AssemblyProduct("Robust.32BitLaunch")]
40[assembly: AssemblyCopyright("Copyright (c) 2008")]
41[assembly: AssemblyTrademark("")]
42[assembly: AssemblyCulture("")]
43
44// Setting ComVisible to false makes the types in this assembly not visible
45// to COM components. If you need to access a type in this assembly from
46// COM, set the ComVisible attribute to true on that type.
47[assembly: ComVisible(false)]
48
49// The following GUID is for the ID of the typelib if this project is exposed to COM
50[assembly: Guid("5072e919-46ab-47e6-8a63-08108324ccdf")]
51
52// Version information for an assembly consists of the following four values:
53//
54// Major Version
55// Minor Version
56// Build Number
57// Revision
58//
59// You can specify all the values or you can default the Build and Revision Numbers
60// by using the '*' as shown below:
61// [assembly: AssemblyVersion("0.6.3.*")]
62[assembly: AssemblyVersion("0.6.3.*")]
63[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln
new file mode 100644
index 0000000..c7c97b1
--- /dev/null
+++ b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln
@@ -0,0 +1,20 @@
1
2Microsoft Visual Studio Solution File, Format Version 10.00
3# Visual C# Express 2008
4Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.32BitLaunch", "Robust.32BitLaunch.csproj", "{595D67F3-B413-4A43-8568-5B5930E3B31D}"
5EndProject
6Global
7 GlobalSection(SolutionConfigurationPlatforms) = preSolution
8 Debug|Any CPU = Debug|Any CPU
9 Release|Any CPU = Release|Any CPU
10 EndGlobalSection
11 GlobalSection(ProjectConfigurationPlatforms) = postSolution
12 {595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
13 {595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.Build.0 = Debug|Any CPU
14 {595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.ActiveCfg = Release|Any CPU
15 {595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.Build.0 = Release|Any CPU
16 EndGlobalSection
17 GlobalSection(SolutionProperties) = preSolution
18 HideSolutionNode = FALSE
19 EndGlobalSection
20EndGlobal
diff --git a/bin/Robust.32BitLaunch.exe b/bin/Robust.32BitLaunch.exe
new file mode 100644
index 0000000..3119dc9
--- /dev/null
+++ b/bin/Robust.32BitLaunch.exe
Binary files differ
diff --git a/bin/Robust.32BitLaunch.exe.config b/bin/Robust.32BitLaunch.exe.config
new file mode 100644
index 0000000..dae45ff
--- /dev/null
+++ b/bin/Robust.32BitLaunch.exe.config
@@ -0,0 +1,32 @@
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 <gcConcurrent enabled="true" />
8 <gcServer enabled="true" />
9 </runtime>
10 <appSettings>
11 </appSettings>
12 <log4net>
13 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
14 <layout type="log4net.Layout.PatternLayout">
15 <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
16 </layout>
17 </appender>
18 <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
19 <file value="Robust.32BitLaunch.log" />
20 <appendToFile value="true" />
21 <layout type="log4net.Layout.PatternLayout">
22 <conversionPattern value="%date %-5level - %logger %message%newline" />
23 </layout>
24 </appender>
25
26 <root>
27 <level value="DEBUG" />
28 <appender-ref ref="Console" />
29 <appender-ref ref="LogFileAppender" />
30 </root>
31 </log4net>
32</configuration>