From 953872510f1c375c2a65a8115e549485814fc0c4 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sun, 11 Jun 2017 22:36:08 +0100
Subject: add/replace sources of OpenSim32.exe
---
share/32BitLaunch/OpenSim.32BitLaunch.exe | Bin 5632 -> 0 bytes
.../OpenSim.32BitLaunch/OpenSim32.csproj | 94 +++++++++++++++++++++
.../OpenSim.32BitLaunch/OpenSim32.csproj.user | 16 ++++
.../32BitLaunch/OpenSim.32BitLaunch/OpenSim32.sln | 22 +++++
share/32BitLaunch/OpenSim.32BitLaunch/Program.cs | 24 +-----
.../OpenSim.32BitLaunch/Properties/AssemblyInfo.cs | 8 +-
share/32BitLaunch/OpenSim.32BitLaunch/app.config | 75 ++++++++++++++++
7 files changed, 213 insertions(+), 26 deletions(-)
delete mode 100755 share/32BitLaunch/OpenSim.32BitLaunch.exe
create mode 100644 share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.csproj
create mode 100644 share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.csproj.user
create mode 100644 share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.sln
create mode 100644 share/32BitLaunch/OpenSim.32BitLaunch/app.config
(limited to 'share')
diff --git a/share/32BitLaunch/OpenSim.32BitLaunch.exe b/share/32BitLaunch/OpenSim.32BitLaunch.exe
deleted file mode 100755
index 62c14af..0000000
Binary files a/share/32BitLaunch/OpenSim.32BitLaunch.exe and /dev/null differ
diff --git a/share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.csproj b/share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.csproj
new file mode 100644
index 0000000..c9a03e1
--- /dev/null
+++ b/share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.csproj
@@ -0,0 +1,94 @@
+
+
+
+ Debug
+ x86
+ {968B4C73-280D-4FF5-9F73-DD3D10160C2E}
+ Exe
+ false
+ OpenSim32
+ v4.0
+
+
+ 512
+ false
+ publish\
+ true
+ Disk
+ false
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ 0
+ 1.0.0.%2a
+ false
+ true
+
+
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+ x86
+
+
+ pdbonly
+ true
+ ..\..\..\bin\
+ TRACE
+ prompt
+ 4
+ x86
+ true
+ false
+
+
+ OpenSim32
+
+
+
+ ..\..\..\bin\log4net.dll
+
+
+
+ ..\..\..\bin\OpenSim.exe
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ False
+ Microsoft .NET Framework 4 %28x86 and x64%29
+ true
+
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
+
+ False
+ Windows Installer 4.5
+ true
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.csproj.user b/share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.csproj.user
new file mode 100644
index 0000000..2f100f7
--- /dev/null
+++ b/share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.csproj.user
@@ -0,0 +1,16 @@
+
+
+
+ publish\
+
+
+
+
+
+ en-US
+ false
+
+
+ C:\Avination\testsim\bin\
+
+
\ No newline at end of file
diff --git a/share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.sln b/share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.sln
new file mode 100644
index 0000000..93522ea
--- /dev/null
+++ b/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
diff --git a/share/32BitLaunch/OpenSim.32BitLaunch/Program.cs b/share/32BitLaunch/OpenSim.32BitLaunch/Program.cs
index 52806b8..ca6c359 100644
--- a/share/32BitLaunch/OpenSim.32BitLaunch/Program.cs
+++ b/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);
}
}
}
diff --git a/share/32BitLaunch/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs b/share/32BitLaunch/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs
index e81870f..bda1a79 100644
--- a/share/32BitLaunch/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs
+++ b/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")]
diff --git a/share/32BitLaunch/OpenSim.32BitLaunch/app.config b/share/32BitLaunch/OpenSim.32BitLaunch/app.config
new file mode 100644
index 0000000..9224240
--- /dev/null
+++ b/share/32BitLaunch/OpenSim.32BitLaunch/app.config
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
--
cgit v1.1
From 25371933b4809e0c542fa7de795e09b1b40bb21e Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 12 Jun 2017 20:36:36 +0100
Subject: update Robust32.exe build files
---
share/32BitLaunch/README | 5 --
share/32BitLaunch/Robust.32BitLaunch.exe | Bin 5632 -> 0 bytes
share/32BitLaunch/Robust.32BitLaunch/Program.cs | 23 +-----
.../32BitLaunch/Robust.32BitLaunch/Robust32.csproj | 92 +++++++++++++++++++++
.../Robust.32BitLaunch/Robust32.csproj.user | 13 +++
share/32BitLaunch/Robust.32BitLaunch/Robust32.sln | 22 +++++
share/32BitLaunch/Robust.32BitLaunch/app.config | 72 ++++++++++++++++
7 files changed, 200 insertions(+), 27 deletions(-)
delete mode 100644 share/32BitLaunch/README
delete mode 100755 share/32BitLaunch/Robust.32BitLaunch.exe
create mode 100644 share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj
create mode 100644 share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj.user
create mode 100644 share/32BitLaunch/Robust.32BitLaunch/Robust32.sln
create mode 100644 share/32BitLaunch/Robust.32BitLaunch/app.config
(limited to 'share')
diff --git a/share/32BitLaunch/README b/share/32BitLaunch/README
deleted file mode 100644
index 443cde0..0000000
--- a/share/32BitLaunch/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Many issues appear in the support channels because of a misunderstanding of the use of these utilities. And through discussion at OpenSimulator Office Hours it was determined that these tools probably serve no useful purpose anymore.
-
-Instead of removing them immediately, we move them here, for a time, in case there is a useful purpose that has escaped us during conversations.
-
-If a need to compile these arises, the OpenSim.32BitLaunch and Robust.32BitLaunch directories may be placed under the ./OpenSim/Tools sources subdirectory, run the prebuild script and compile.
diff --git a/share/32BitLaunch/Robust.32BitLaunch.exe b/share/32BitLaunch/Robust.32BitLaunch.exe
deleted file mode 100755
index affedb4..0000000
Binary files a/share/32BitLaunch/Robust.32BitLaunch.exe and /dev/null 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 @@
*/
using System;
-using log4net;
-namespace Robust._32BitLaunch
+namespace Robust32
{
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("");
- }
}
}
}
diff --git a/share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj b/share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj
new file mode 100644
index 0000000..a6dae90
--- /dev/null
+++ b/share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj
@@ -0,0 +1,92 @@
+
+
+
+ Debug
+ x86
+ {A159489E-6552-4734-8EFA-8E031F63C7F6}
+ Exe
+ false
+ Robust32
+ v4.0
+
+
+ 512
+ publish\
+ true
+ Disk
+ false
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ 0
+ 1.0.0.%2a
+ false
+ false
+ true
+
+
+ true
+ full
+ false
+ ..\..\..\bin\
+ DEBUG;TRACE
+ prompt
+ 4
+ x86
+
+
+ pdbonly
+ true
+ ..\..\..\bin\
+ TRACE
+ prompt
+ 4
+ x86
+ true
+ Off
+
+
+ Robust32
+
+
+ Robust32.Program
+
+
+
+
+ False
+ ..\..\..\bin\Robust.exe
+
+
+
+
+
+
+
+
+
+
+
+ False
+ Microsoft .NET Framework 4 %28x86 and x64%29
+ true
+
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
+
+ False
+ Windows Installer 4.5
+ true
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj.user b/share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj.user
new file mode 100644
index 0000000..8221333
--- /dev/null
+++ b/share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj.user
@@ -0,0 +1,13 @@
+
+
+
+ publish\
+
+
+
+
+
+ en-US
+ false
+
+
\ No newline at end of file
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 @@
+
+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}") = "Robust32", "Robust32.csproj", "{A159489E-6552-4734-8EFA-8E031F63C7F6}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x86 = Debug|x86
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {A159489E-6552-4734-8EFA-8E031F63C7F6}.Debug|x86.ActiveCfg = Debug|x86
+ {A159489E-6552-4734-8EFA-8E031F63C7F6}.Debug|x86.Build.0 = Debug|x86
+ {A159489E-6552-4734-8EFA-8E031F63C7F6}.Release|x86.ActiveCfg = Release|x86
+ {A159489E-6552-4734-8EFA-8E031F63C7F6}.Release|x86.Build.0 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
--
cgit v1.1
From 17b79cec913172bc0c6d02aab2bc4ebd2ad5e244 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 13 Dec 2017 02:14:51 +0000
Subject: mantis 8255 update example_web.xml
---
share/RegionLoading/example_web.xml | 34 ++++++++++++++++++++++++++--------
1 file changed, 26 insertions(+), 8 deletions(-)
(limited to 'share')
diff --git a/share/RegionLoading/example_web.xml b/share/RegionLoading/example_web.xml
index f7ed25e..39e8023 100644
--- a/share/RegionLoading/example_web.xml
+++ b/share/RegionLoading/example_web.xml
@@ -1,8 +1,26 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
\ No newline at end of file
--
cgit v1.1