OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

link-sitting
Justin Clark-Casey (justincc) 2013-11-13 23:27:25 +00:00
parent 7da10850b0 869a23e223
commit 8114ae0f8b
5 changed files with 202 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
OpenSim/Tools/OpenSim.32BitLaunch/OpenSim.32BitLaunch.csproj
View File

@ -1,58 +1,97 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion> <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid> <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OpenSim._32BitLaunch</RootNamespace> <RootNamespace>OpenSim._32BitLaunch</RootNamespace>
<AssemblyName>OpenSim.32BitLaunch</AssemblyName> <AssemblyName>OpenSim.32BitLaunch</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
</PropertyGroup> <FileUpgradeFlags>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> </FileUpgradeFlags>
<DebugSymbols>true</DebugSymbols> <UpgradeBackupLocation>
<DebugType>full</DebugType> </UpgradeBackupLocation>
<Optimize>false</Optimize> <OldToolsVersion>3.5</OldToolsVersion>
<OutputPath>..\..\..\bin\</OutputPath> <PublishUrl>publish\</PublishUrl>
<DefineConstants>DEBUG;TRACE</DefineConstants> <Install>true</Install>
<ErrorReport>prompt</ErrorReport> <InstallFrom>Disk</InstallFrom>
<WarningLevel>4</WarningLevel> <UpdateEnabled>false</UpdateEnabled>
<PlatformTarget>x86</PlatformTarget> <UpdateMode>Foreground</UpdateMode>
</PropertyGroup> <UpdateInterval>7</UpdateInterval>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <UpdateIntervalUnits>Days</UpdateIntervalUnits>
<DebugType>pdbonly</DebugType> <UpdatePeriodically>false</UpdatePeriodically>
<Optimize>true</Optimize> <UpdateRequired>false</UpdateRequired>
<OutputPath>bin\Release\</OutputPath> <MapFileExtensions>true</MapFileExtensions>
<DefineConstants>TRACE</DefineConstants> <ApplicationRevision>0</ApplicationRevision>
<ErrorReport>prompt</ErrorReport> <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<WarningLevel>4</WarningLevel> <IsWebBootstrapper>false</IsWebBootstrapper>
</PropertyGroup> <UseApplicationTrust>false</UseApplicationTrust>
<ItemGroup> <BootstrapperEnabled>true</BootstrapperEnabled>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" /> </PropertyGroup>
<Reference Include="System" /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<Reference Include="System.Data" /> <DebugSymbols>true</DebugSymbols>
<Reference Include="System.Xml" /> <DebugType>full</DebugType>
</ItemGroup> <Optimize>false</Optimize>
<ItemGroup> <OutputPath>..\..\..\bin\</OutputPath>
<Compile Include="Program.cs" /> <DefineConstants>DEBUG;TRACE</DefineConstants>
<Compile Include="Properties\AssemblyInfo.cs" /> <ErrorReport>prompt</ErrorReport>
</ItemGroup> <WarningLevel>4</WarningLevel>
<ItemGroup> <PlatformTarget>x86</PlatformTarget>
<ProjectReference Include="..\..\Region\Application\OpenSim.csproj"> </PropertyGroup>
<Project>{438A9556-0000-0000-0000-000000000000}</Project> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Name>OpenSim</Name> <DebugType>pdbonly</DebugType>
</ProjectReference> <Optimize>true</Optimize>
</ItemGroup> <OutputPath>bin\Release\</OutputPath>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" />
<Reference Include="OpenSim, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<ExecutableExtension>.exe</ExecutableExtension>
<HintPath>..\..\..\bin\OpenSim.exe</HintPath>
</Reference>
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</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.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</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.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">
</Target> </Target>
<Target Name="AfterBuild"> <Target Name="AfterBuild">
</Target> </Target>
--> -->
</Project> </Project>

147
OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.csproj
View File

@ -1,62 +1,99 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion> <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid> <ProjectGuid>{595D67F3-B413-4A43-8568-5B5930E3B31D}</ProjectGuid>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Robust._32BitLaunch</RootNamespace> <RootNamespace>Robust._32BitLaunch</RootNamespace>
<AssemblyName>Robust.32BitLaunch</AssemblyName> <AssemblyName>Robust.32BitLaunch</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
</PropertyGroup> <FileUpgradeFlags>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> </FileUpgradeFlags>
<DebugSymbols>true</DebugSymbols> <UpgradeBackupLocation>
<DebugType>full</DebugType> </UpgradeBackupLocation>
<Optimize>false</Optimize> <OldToolsVersion>3.5</OldToolsVersion>
<OutputPath>..\..\..\bin\</OutputPath> <PublishUrl>publish\</PublishUrl>
<DefineConstants>DEBUG;TRACE</DefineConstants> <Install>true</Install>
<ErrorReport>prompt</ErrorReport> <InstallFrom>Disk</InstallFrom>
<WarningLevel>4</WarningLevel> <UpdateEnabled>false</UpdateEnabled>
<PlatformTarget>x86</PlatformTarget> <UpdateMode>Foreground</UpdateMode>
</PropertyGroup> <UpdateInterval>7</UpdateInterval>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <UpdateIntervalUnits>Days</UpdateIntervalUnits>
<DebugType>pdbonly</DebugType> <UpdatePeriodically>false</UpdatePeriodically>
<Optimize>true</Optimize> <UpdateRequired>false</UpdateRequired>
<OutputPath>bin\Release\</OutputPath> <MapFileExtensions>true</MapFileExtensions>
<DefineConstants>TRACE</DefineConstants> <ApplicationRevision>0</ApplicationRevision>
<ErrorReport>prompt</ErrorReport> <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<WarningLevel>4</WarningLevel> <IsWebBootstrapper>false</IsWebBootstrapper>
</PropertyGroup> <UseApplicationTrust>false</UseApplicationTrust>
<ItemGroup> <BootstrapperEnabled>true</BootstrapperEnabled>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL"> </PropertyGroup>
<SpecificVersion>False</SpecificVersion> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<HintPath>..\..\..\bin\log4net.dll</HintPath> <DebugSymbols>true</DebugSymbols>
</Reference> <DebugType>full</DebugType>
<Reference Include="Robust, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Optimize>false</Optimize>
<SpecificVersion>False</SpecificVersion> <OutputPath>..\..\..\bin\</OutputPath>
<HintPath>..\..\..\bin\Robust.exe</HintPath> <DefineConstants>DEBUG;TRACE</DefineConstants>
</Reference> <ErrorReport>prompt</ErrorReport>
<Reference Include="System" /> <WarningLevel>4</WarningLevel>
<Reference Include="System.Core"> <PlatformTarget>x86</PlatformTarget>
<RequiredTargetFramework>3.5</RequiredTargetFramework> </PropertyGroup>
</Reference> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Reference Include="System.Data" /> <DebugType>pdbonly</DebugType>
<Reference Include="System.Xml" /> <Optimize>true</Optimize>
</ItemGroup> <OutputPath>bin\Release\</OutputPath>
<ItemGroup> <DefineConstants>TRACE</DefineConstants>
<Compile Include="Program.cs" /> <ErrorReport>prompt</ErrorReport>
<Compile Include="Properties\AssemblyInfo.cs" /> <WarningLevel>4</WarningLevel>
</ItemGroup> </PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ItemGroup>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\bin\log4net.dll</HintPath>
</Reference>
<Reference Include="Robust, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\bin\Robust.exe</HintPath>
</Reference>
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</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.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</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.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">
</Target> </Target>
<Target Name="AfterBuild"> <Target Name="AfterBuild">
</Target> </Target>
--> -->
</Project> </Project>

40
OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln
View File

@ -1,20 +1,20 @@
 
Microsoft Visual Studio Solution File, Format Version 10.00 Microsoft Visual Studio Solution File, Format Version 11.00
# Visual C# Express 2008 # Visual C# Express 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.32BitLaunch", "Robust.32BitLaunch.csproj", "{595D67F3-B413-4A43-8568-5B5930E3B31D}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.32BitLaunch", "Robust.32BitLaunch.csproj", "{595D67F3-B413-4A43-8568-5B5930E3B31D}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.Build.0 = Debug|Any CPU {595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.ActiveCfg = Release|Any CPU {595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.Build.0 = Release|Any CPU {595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal

BIN
bin/OpenSim.32BitLaunch.exe
View File

Binary file not shown.

BIN
bin/Robust.32BitLaunch.exe Normal file → Executable file
View File

Binary file not shown.