aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-11-13 23:27:25 +0000
committerJustin Clark-Casey (justincc)2013-11-13 23:27:25 +0000
commit8114ae0f8bb267cc7713511bc220e5dfbee49b31 (patch)
tree8b33d2fd4c3ae167e503b3d744b0635b0350e0b3
parentFix bug where removing a physical linkset would only decrement the Active Obj... (diff)
parentUpdate OpenSim.32BitLaunch.exe and Robust.32BitLaunch.exe to .NET 4 versions. (diff)
downloadopensim-SC_OLD-8114ae0f8bb267cc7713511bc220e5dfbee49b31.zip
opensim-SC_OLD-8114ae0f8bb267cc7713511bc220e5dfbee49b31.tar.gz
opensim-SC_OLD-8114ae0f8bb267cc7713511bc220e5dfbee49b31.tar.bz2
opensim-SC_OLD-8114ae0f8bb267cc7713511bc220e5dfbee49b31.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat
-rw-r--r--OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj141
-rw-r--r--OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj147
-rw-r--r--OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln40
-rwxr-xr-xbin/OpenSim.32BitLaunch.exebin5632 -> 5632 bytes
-rwxr-xr-x[-rw-r--r--]bin/Robust.32BitLaunch.exebin5632 -> 5632 bytes
5 files changed, 202 insertions, 126 deletions
diff --git a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj b/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
index d829e69..4625c33 100644
--- a/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
+++ b/OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
@@ -1,58 +1,97 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <PropertyGroup> 3 <PropertyGroup>
4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6 <ProductVersion>9.0.30729</ProductVersion> 6 <ProductVersion>9.0.30729</ProductVersion>
7 <SchemaVersion>2.0</SchemaVersion> 7 <SchemaVersion>2.0</SchemaVersion>
8 <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid> 8 <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
9 <OutputType>Exe</OutputType> 9 <OutputType>Exe</OutputType>
10 <AppDesignerFolder>Properties</AppDesignerFolder> 10 <AppDesignerFolder>Properties</AppDesignerFolder>
11 <RootNamespace>OpenSim._32BitLaunch</RootNamespace> 11 <RootNamespace>OpenSim._32BitLaunch</RootNamespace>
12 <AssemblyName>OpenSim.32BitLaunch</AssemblyName> 12 <AssemblyName>OpenSim.32BitLaunch</AssemblyName>
13 <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> 13 <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14 <FileAlignment>512</FileAlignment> 14 <FileAlignment>512</FileAlignment>
15 </PropertyGroup> 15 <FileUpgradeFlags>
16 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> 16 </FileUpgradeFlags>
17 <DebugSymbols>true</DebugSymbols> 17 <UpgradeBackupLocation>
18 <DebugType>full</DebugType> 18 </UpgradeBackupLocation>
19 <Optimize>false</Optimize> 19 <OldToolsVersion>3.5</OldToolsVersion>
20 <OutputPath>..\..\..\bin\</OutputPath> 20 <PublishUrl>publish\</PublishUrl>
21 <DefineConstants>DEBUG;TRACE</DefineConstants> 21 <Install>true</Install>
22 <ErrorReport>prompt</ErrorReport> 22 <InstallFrom>Disk</InstallFrom>
23 <WarningLevel>4</WarningLevel> 23 <UpdateEnabled>false</UpdateEnabled>
24 <PlatformTarget>x86</PlatformTarget> 24 <UpdateMode>Foreground</UpdateMode>
25 </PropertyGroup> 25 <UpdateInterval>7</UpdateInterval>
26 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 26 <UpdateIntervalUnits>Days</UpdateIntervalUnits>
27 <DebugType>pdbonly</DebugType> 27 <UpdatePeriodically>false</UpdatePeriodically>
28 <Optimize>true</Optimize> 28 <UpdateRequired>false</UpdateRequired>
29 <OutputPath>bin\Release\</OutputPath> 29 <MapFileExtensions>true</MapFileExtensions>
30 <DefineConstants>TRACE</DefineConstants> 30 <ApplicationRevision>0</ApplicationRevision>
31 <ErrorReport>prompt</ErrorReport> 31 <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
32 <WarningLevel>4</WarningLevel> 32 <IsWebBootstrapper>false</IsWebBootstrapper>
33 </PropertyGroup> 33 <UseApplicationTrust>false</UseApplicationTrust>
34 <ItemGroup> 34 <BootstrapperEnabled>true</BootstrapperEnabled>
35 <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" /> 35 </PropertyGroup>
36 <Reference Include="System" /> 36 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
37 <Reference Include="System.Data" /> 37 <DebugSymbols>true</DebugSymbols>
38 <Reference Include="System.Xml" /> 38 <DebugType>full</DebugType>
39 </ItemGroup> 39 <Optimize>false</Optimize>
40 <ItemGroup> 40 <OutputPath>..\..\..\bin\</OutputPath>
41 <Compile Include="Program.cs" /> 41 <DefineConstants>DEBUG;TRACE</DefineConstants>
42 <Compile Include="Properties\AssemblyInfo.cs" /> 42 <ErrorReport>prompt</ErrorReport>
43 </ItemGroup> 43 <WarningLevel>4</WarningLevel>
44 <ItemGroup> 44 <PlatformTarget>x86</PlatformTarget>
45 <ProjectReference Include="..\..\Region\Application\OpenSim.csproj"> 45 </PropertyGroup>
46 <Project>{438A9556-0000-0000-0000-000000000000}</Project> 46 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
47 <Name>OpenSim</Name> 47 <DebugType>pdbonly</DebugType>
48 </ProjectReference> 48 <Optimize>true</Optimize>
49 </ItemGroup> 49 <OutputPath>bin\Release\</OutputPath>
50 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 50 <DefineConstants>TRACE</DefineConstants>
51 <ErrorReport>prompt</ErrorReport>
52 <WarningLevel>4</WarningLevel>
53 </PropertyGroup>
54 <ItemGroup>
55 <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" />
56 <Reference Include="OpenSim, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
57 <SpecificVersion>False</SpecificVersion>
58 <ExecutableExtension>.exe</ExecutableExtension>
59 <HintPath>..\..\..\bin\OpenSim.exe</HintPath>
60 </Reference>
61 <Reference Include="System" />
62 </ItemGroup>
63 <ItemGroup>
64 <Compile Include="Program.cs" />
65 <Compile Include="Properties\AssemblyInfo.cs" />
66 </ItemGroup>
67 <ItemGroup>
68 <BootstrapperPackage Include=".NETFramework,Version=v4.0">
69 <Visible>False</Visible>
70 <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
71 <Install>true</Install>
72 </BootstrapperPackage>
73 <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
74 <Visible>False</Visible>
75 <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
76 <Install>false</Install>
77 </BootstrapperPackage>
78 <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
79 <Visible>False</Visible>
80 <ProductName>.NET Framework 3.5 SP1</ProductName>
81 <Install>false</Install>
82 </BootstrapperPackage>
83 <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
84 <Visible>False</Visible>
85 <ProductName>Windows Installer 3.1</ProductName>
86 <Install>true</Install>
87 </BootstrapperPackage>
88 </ItemGroup>
89 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
51 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 90 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
52 Other similar extension points exist, see Microsoft.Common.targets. 91 Other similar extension points exist, see Microsoft.Common.targets.
53 <Target Name="BeforeBuild"> 92 <Target Name="BeforeBuild">
54 </Target> 93 </Target>
55 <Target Name="AfterBuild"> 94 <Target Name="AfterBuild">
56 </Target> 95 </Target>
57 --> 96 -->
58</Project> \ No newline at end of file 97</Project> \ No newline at end of file
diff --git a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj
index 481b3f8..9618c08 100644
--- a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj
+++ b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj
@@ -1,62 +1,99 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <PropertyGroup> 3 <PropertyGroup>
4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6 <ProductVersion>9.0.30729</ProductVersion> 6 <ProductVersion>9.0.30729</ProductVersion>
7 <SchemaVersion>2.0</SchemaVersion> 7 <SchemaVersion>2.0</SchemaVersion>
8 <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid> 8 <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
9 <OutputType>Exe</OutputType> 9 <OutputType>Exe</OutputType>
10 <AppDesignerFolder>Properties</AppDesignerFolder> 10 <AppDesignerFolder>Properties</AppDesignerFolder>
11 <RootNamespace>Robust._32BitLaunch</RootNamespace> 11 <RootNamespace>Robust._32BitLaunch</RootNamespace>
12 <AssemblyName>Robust.32BitLaunch</AssemblyName> 12 <AssemblyName>Robust.32BitLaunch</AssemblyName>
13 <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> 13 <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14 <FileAlignment>512</FileAlignment> 14 <FileAlignment>512</FileAlignment>
15 </PropertyGroup> 15 <FileUpgradeFlags>
16 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> 16 </FileUpgradeFlags>
17 <DebugSymbols>true</DebugSymbols> 17 <UpgradeBackupLocation>
18 <DebugType>full</DebugType> 18 </UpgradeBackupLocation>
19 <Optimize>false</Optimize> 19 <OldToolsVersion>3.5</OldToolsVersion>
20 <OutputPath>..\..\..\bin\</OutputPath> 20 <PublishUrl>publish\</PublishUrl>
21 <DefineConstants>DEBUG;TRACE</DefineConstants> 21 <Install>true</Install>
22 <ErrorReport>prompt</ErrorReport> 22 <InstallFrom>Disk</InstallFrom>
23 <WarningLevel>4</WarningLevel> 23 <UpdateEnabled>false</UpdateEnabled>
24 <PlatformTarget>x86</PlatformTarget> 24 <UpdateMode>Foreground</UpdateMode>
25 </PropertyGroup> 25 <UpdateInterval>7</UpdateInterval>
26 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 26 <UpdateIntervalUnits>Days</UpdateIntervalUnits>
27 <DebugType>pdbonly</DebugType> 27 <UpdatePeriodically>false</UpdatePeriodically>
28 <Optimize>true</Optimize> 28 <UpdateRequired>false</UpdateRequired>
29 <OutputPath>bin\Release\</OutputPath> 29 <MapFileExtensions>true</MapFileExtensions>
30 <DefineConstants>TRACE</DefineConstants> 30 <ApplicationRevision>0</ApplicationRevision>
31 <ErrorReport>prompt</ErrorReport> 31 <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
32 <WarningLevel>4</WarningLevel> 32 <IsWebBootstrapper>false</IsWebBootstrapper>
33 </PropertyGroup> 33 <UseApplicationTrust>false</UseApplicationTrust>
34 <ItemGroup> 34 <BootstrapperEnabled>true</BootstrapperEnabled>
35 <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL"> 35 </PropertyGroup>
36 <SpecificVersion>False</SpecificVersion> 36 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
37 <HintPath>..\..\..\bin\log4net.dll</HintPath> 37 <DebugSymbols>true</DebugSymbols>
38 </Reference> 38 <DebugType>full</DebugType>
39 <Reference Include="Robust, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"> 39 <Optimize>false</Optimize>
40 <SpecificVersion>False</SpecificVersion> 40 <OutputPath>..\..\..\bin\</OutputPath>
41 <HintPath>..\..\..\bin\Robust.exe</HintPath> 41 <DefineConstants>DEBUG;TRACE</DefineConstants>
42 </Reference> 42 <ErrorReport>prompt</ErrorReport>
43 <Reference Include="System" /> 43 <WarningLevel>4</WarningLevel>
44 <Reference Include="System.Core"> 44 <PlatformTarget>x86</PlatformTarget>
45 <RequiredTargetFramework>3.5</RequiredTargetFramework> 45 </PropertyGroup>
46 </Reference> 46 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
47 <Reference Include="System.Data" /> 47 <DebugType>pdbonly</DebugType>
48 <Reference Include="System.Xml" /> 48 <Optimize>true</Optimize>
49 </ItemGroup> 49 <OutputPath>bin\Release\</OutputPath>
50 <ItemGroup> 50 <DefineConstants>TRACE</DefineConstants>
51 <Compile Include="Program.cs" /> 51 <ErrorReport>prompt</ErrorReport>
52 <Compile Include="Properties\AssemblyInfo.cs" /> 52 <WarningLevel>4</WarningLevel>
53 </ItemGroup> 53 </PropertyGroup>
54 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 54 <ItemGroup>
55 <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
56 <SpecificVersion>False</SpecificVersion>
57 <HintPath>..\..\..\bin\log4net.dll</HintPath>
58 </Reference>
59 <Reference Include="Robust, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
60 <SpecificVersion>False</SpecificVersion>
61 <HintPath>..\..\..\bin\Robust.exe</HintPath>
62 </Reference>
63 <Reference Include="System" />
64 </ItemGroup>
65 <ItemGroup>
66 <Compile Include="Program.cs" />
67 <Compile Include="Properties\AssemblyInfo.cs" />
68 </ItemGroup>
69 <ItemGroup>
70 <BootstrapperPackage Include=".NETFramework,Version=v4.0">
71 <Visible>False</Visible>
72 <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
73 <Install>true</Install>
74 </BootstrapperPackage>
75 <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
76 <Visible>False</Visible>
77 <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
78 <Install>false</Install>
79 </BootstrapperPackage>
80 <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
81 <Visible>False</Visible>
82 <ProductName>.NET Framework 3.5 SP1</ProductName>
83 <Install>false</Install>
84 </BootstrapperPackage>
85 <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
86 <Visible>False</Visible>
87 <ProductName>Windows Installer 3.1</ProductName>
88 <Install>true</Install>
89 </BootstrapperPackage>
90 </ItemGroup>
91 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
55 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 92 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
56 Other similar extension points exist, see Microsoft.Common.targets. 93 Other similar extension points exist, see Microsoft.Common.targets.
57 <Target Name="BeforeBuild"> 94 <Target Name="BeforeBuild">
58 </Target> 95 </Target>
59 <Target Name="AfterBuild"> 96 <Target Name="AfterBuild">
60 </Target> 97 </Target>
61 --> 98 -->
62</Project> \ No newline at end of file 99</Project> \ No newline at end of file
diff --git a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln
index c7c97b1..a48a2d3 100644
--- a/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln
+++ b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln
@@ -1,20 +1,20 @@
1 1
2Microsoft Visual Studio Solution File, Format Version 10.00 2Microsoft Visual Studio Solution File, Format Version 11.00
3# Visual C# Express 2008 3# Visual C# Express 2010
4Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.32BitLaunch", "Robust.32BitLaunch.csproj", "{595D67F3-B413-4A43-8568-5B5930E3B31D}" 4Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.32BitLaunch", "Robust.32BitLaunch.csproj", "{595D67F3-B413-4A43-8568-5B5930E3B31D}"
5EndProject 5EndProject
6Global 6Global
7 GlobalSection(SolutionConfigurationPlatforms) = preSolution 7 GlobalSection(SolutionConfigurationPlatforms) = preSolution
8 Debug|Any CPU = Debug|Any CPU 8 Debug|Any CPU = Debug|Any CPU
9 Release|Any CPU = Release|Any CPU 9 Release|Any CPU = Release|Any CPU
10 EndGlobalSection 10 EndGlobalSection
11 GlobalSection(ProjectConfigurationPlatforms) = postSolution 11 GlobalSection(ProjectConfigurationPlatforms) = postSolution
12 {595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 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 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 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 15 {595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.Build.0 = Release|Any CPU
16 EndGlobalSection 16 EndGlobalSection
17 GlobalSection(SolutionProperties) = preSolution 17 GlobalSection(SolutionProperties) = preSolution
18 HideSolutionNode = FALSE 18 HideSolutionNode = FALSE
19 EndGlobalSection 19 EndGlobalSection
20EndGlobal 20EndGlobal
diff --git a/bin/OpenSim.32BitLaunch.exe b/bin/OpenSim.32BitLaunch.exe
index cc73c8b..62c14af 100755
--- a/bin/OpenSim.32BitLaunch.exe
+++ b/bin/OpenSim.32BitLaunch.exe
Binary files differ
diff --git a/bin/Robust.32BitLaunch.exe b/bin/Robust.32BitLaunch.exe
index 4d2698b..affedb4 100644..100755
--- a/bin/Robust.32BitLaunch.exe
+++ b/bin/Robust.32BitLaunch.exe
Binary files differ
generated by cgit v1.1 at 2024-12-25 13:49:15 +0000