Merge branch 'master' into bullet-2.82

1 files changed, 0 insertions, 60 deletions

diff --git a/OpenSim/Tools/Robust.32BitLaunch/Program.cs b/OpenSim/Tools/Robust.32BitLaunch/Program.cs
deleted file mode 100644
index 490414c..0000000
--- a/OpenSim/Tools/Robust.32BitLaunch/Program.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using log4net;
-
-namespace Robust._32BitLaunch
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            log4net.Config.XmlConfigurator.Configure();
-
-            System.Console.WriteLine("32-bit OpenSim executor");
-            System.Console.WriteLine("-----------------------");
-            System.Console.WriteLine("");
-            System.Console.WriteLine("This application is compiled for 32-bit CPU and will run under WOW32 or similar.");
-            System.Console.WriteLine("All 64-bit incompatibilities should be gone.");
-            System.Console.WriteLine("");
-            System.Threading.Thread.Sleep(300);
-            try
-            {
-                global::OpenSim.Server.OpenSimServer.Main(args);
-            }
-            catch (Exception ex)
-            {
-                System.Console.WriteLine("OpenSim threw an exception:");
-                System.Console.WriteLine(ex.ToString());
-                System.Console.WriteLine("");
-                System.Console.WriteLine("Application will now terminate!");
-                System.Console.WriteLine("");
-            }
-        }
-    }
-}