add/replace sources of OpenSim32.exe

share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.csproj

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{968B4C73-280D-4FF5-9F73-DD3D10160C2E}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <NoStandardLibraries>false</NoStandardLibraries>
+    <AssemblyName>OpenSim32</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RootNamespace>OpenSim32</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="log4net">
+      <HintPath>..\..\..\bin\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="OpenSim">
+      <HintPath>..\..\..\bin\OpenSim.exe</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.4.5">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 4.5</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSHARP.Targets" />
+  <ProjectExtensions>
+    <VisualStudio AllowExistingFolder="true" />
+  </ProjectExtensions>
+</Project>

share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.csproj.user

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishUrlHistory>publish\</PublishUrlHistory>
+    <InstallUrlHistory />
+    <SupportUrlHistory />
+    <UpdateUrlHistory />
+    <BootstrapperUrlHistory />
+    <ErrorReportUrlHistory />
+    <FallbackCulture>en-US</FallbackCulture>
+    <VerifyUploadedFiles>false</VerifyUploadedFiles>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ReferencePath>C:\Avination\testsim\bin\</ReferencePath>
+  </PropertyGroup>
+</Project>

share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.sln

@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim32", "OpenSim32.csproj", "{968B4C73-280D-4FF5-9F73-DD3D10160C2E}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x86 = Debug|x86
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{968B4C73-280D-4FF5-9F73-DD3D10160C2E}.Debug|x86.ActiveCfg = Release|x86
+		{968B4C73-280D-4FF5-9F73-DD3D10160C2E}.Debug|x86.Build.0 = Release|x86
+		{968B4C73-280D-4FF5-9F73-DD3D10160C2E}.Release|x86.ActiveCfg = Release|x86
+		{968B4C73-280D-4FF5-9F73-DD3D10160C2E}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

share/32BitLaunch/OpenSim.32BitLaunch/Program.cs

@@ -27,33 +27,13 @@
 
 using System;
 
-namespace OpenSim._32BitLaunch
+namespace OpenSim32
 {
     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.Application.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("");
-            }
+            global::OpenSim.Application.Main(args);
         }
     }
 }

share/32BitLaunch/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs

@@ -32,11 +32,11 @@ using System.Runtime.InteropServices;
 // General information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("OpenSim.32BitLaunch")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("OpenSim32")]
+[assembly: AssemblyDescription("OpenSim 32Bit Launcher")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("http://opensimulator.org")]
-[assembly: AssemblyProduct("OpenSim.32BitLaunch")]
+[assembly: AssemblyProduct("OpenSim 32BitLauncher")]
 [assembly: AssemblyCopyright("Copyright (c) 2008")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -59,5 +59,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("0.6.3.*")]
-[assembly: AssemblyVersion("0.6.3.*")]
+[assembly: AssemblyVersion("0.9.1.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

share/32BitLaunch/OpenSim.32BitLaunch/app.config

@@ -0,0 +1,75 @@
+<configuration>
+    <configSections>
+        <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
+    </configSections>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
+    </startup>
+    <runtime>
+        <loadFromRemoteSources enabled="true" />
+    </runtime>
+    <appSettings>
+    </appSettings>
+    <log4net>
+        <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
+            <filter type="log4net.Filter.LoggerMatchFilter">
+                <loggerToMatch value="special"/>
+                <acceptOnMatch value="false"/>
+            </filter>
+            <layout type="log4net.Layout.PatternLayout">
+                <conversionPattern value="%date{HH:mm:ss} - %message" />
+                <!-- console log with milliseconds.  Useful for debugging -->
+                <!--        <conversionPattern value="%date{HH:mm:ss.fff} - %message" /> -->
+            </layout>
+        </appender>
+
+        <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
+    <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
+      <file value="log/OpenSim.log" />
+      <rollingStyle value="Date" />
+      <datePattern value="'.'yyyy-MM-dd"/>
+      ...
+-->
+
+        <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
+            <file value="OpenSim.log" />
+            <appendToFile value="true" />
+            <filter type="log4net.Filter.LoggerMatchFilter">
+                <loggerToMatch value="special"/>
+                <acceptOnMatch value="false"/>
+            </filter>
+            <layout type="log4net.Layout.PatternLayout">
+                <conversionPattern value="%date %-5level - %logger %message%newline" />
+            </layout>
+        </appender>
+
+        <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
+            <file value="OpenSimStats.log"/>
+            <appendToFile value="true" />
+            <layout type="log4net.Layout.PatternLayout">
+                <conversionPattern value="%date - %message%newline" />
+            </layout>
+        </appender>
+
+        <root>
+            <level value="DEBUG" />
+            <appender-ref ref="Console" />
+            <appender-ref ref="LogFileAppender" />
+        </root>
+
+        <!-- Independently control logging level for XEngine -->
+        <logger name="OpenSim.Region.ScriptEngine.XEngine">
+            <level value="INFO"/>
+        </logger>
+
+        <!-- Independently control logging level for per region module loading -->
+        <logger name="OpenSim.ApplicationPlugins.RegionModulesController.RegionModulesControllerPlugin">
+            <level value="INFO"/>
+        </logger>
+
+        <!-- used for stats recording -->
+        <logger name="special.StatsLogger">
+            <appender-ref ref="StatsLogFileAppender"/>
+        </logger>
+    </log4net>
+</configuration>