diff options
author | lbsa71 | 2007-03-29 17:29:52 +0000 |
---|---|---|
committer | lbsa71 | 2007-03-29 17:29:52 +0000 |
commit | 9ea0e881a45701782240013c8f17dfad7e5ab463 (patch) | |
tree | 2797cc03bee56f0d6d0a7ddc25ccce021b09740d /Prebuild/src | |
parent | Fixed so Inventory structure is correct after a log out and re-login (in Sand... (diff) | |
download | opensim-SC_OLD-9ea0e881a45701782240013c8f17dfad7e5ab463.zip opensim-SC_OLD-9ea0e881a45701782240013c8f17dfad7e5ab463.tar.gz opensim-SC_OLD-9ea0e881a45701782240013c8f17dfad7e5ab463.tar.bz2 opensim-SC_OLD-9ea0e881a45701782240013c8f17dfad7e5ab463.tar.xz |
* Naaw, -realphysx is too much to ask
* Genning proj Guids from name hash, for great justice
Diffstat (limited to 'Prebuild/src')
-rw-r--r-- | Prebuild/src/Core/Nodes/ProjectNode.cs | 6 | ||||
-rw-r--r-- | Prebuild/src/Core/Targets/VS2005Target.cs | 2 | ||||
-rw-r--r-- | Prebuild/src/Prebuild.csproj | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/Prebuild/src/Core/Nodes/ProjectNode.cs b/Prebuild/src/Core/Nodes/ProjectNode.cs index 7ac0a36..84d9f5d 100644 --- a/Prebuild/src/Core/Nodes/ProjectNode.cs +++ b/Prebuild/src/Core/Nodes/ProjectNode.cs | |||
@@ -424,7 +424,11 @@ namespace Prebuild.Core.Nodes | |||
424 | m_Runtime = (ClrRuntime)Helper.EnumAttributeValue(node, "runtime", typeof(ClrRuntime), m_Runtime); | 424 | m_Runtime = (ClrRuntime)Helper.EnumAttributeValue(node, "runtime", typeof(ClrRuntime), m_Runtime); |
425 | m_StartupObject = Helper.AttributeValue(node, "startupObject", m_StartupObject); | 425 | m_StartupObject = Helper.AttributeValue(node, "startupObject", m_StartupObject); |
426 | m_RootNamespace = Helper.AttributeValue(node, "rootNamespace", m_RootNamespace); | 426 | m_RootNamespace = Helper.AttributeValue(node, "rootNamespace", m_RootNamespace); |
427 | m_Guid = Guid.NewGuid(); | 427 | |
428 | int hash = m_Name.GetHashCode(); | ||
429 | |||
430 | m_Guid = new Guid( hash, 0, 0, 0, 0, 0, 0,0,0,0,0 ); | ||
431 | |||
428 | m_GenerateAssemblyInfoFile = Helper.ParseBoolean(node, "generateAssemblyInfoFile", false); | 432 | m_GenerateAssemblyInfoFile = Helper.ParseBoolean(node, "generateAssemblyInfoFile", false); |
429 | 433 | ||
430 | if(m_AssemblyName == null || m_AssemblyName.Length < 1) | 434 | if(m_AssemblyName == null || m_AssemblyName.Length < 1) |
diff --git a/Prebuild/src/Core/Targets/VS2005Target.cs b/Prebuild/src/Core/Targets/VS2005Target.cs index 6435593..23b6116 100644 --- a/Prebuild/src/Core/Targets/VS2005Target.cs +++ b/Prebuild/src/Core/Targets/VS2005Target.cs | |||
@@ -665,7 +665,7 @@ namespace Prebuild.Core.Targets | |||
665 | 665 | ||
666 | if (projectFile.Contains( "OpenSim.csproj" )) | 666 | if (projectFile.Contains( "OpenSim.csproj" )) |
667 | { | 667 | { |
668 | ps.WriteLine(" <StartArguments>-loginserver -sandbox -accounts -realphysx</StartArguments>"); | 668 | ps.WriteLine(" <StartArguments>-loginserver -sandbox -accounts</StartArguments>"); |
669 | } | 669 | } |
670 | 670 | ||
671 | ps.WriteLine(" <ReferencePath>{0}</ReferencePath>", MakeRefPath(project)); | 671 | ps.WriteLine(" <ReferencePath>{0}</ReferencePath>", MakeRefPath(project)); |
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj index 34daca9..55efffa 100644 --- a/Prebuild/src/Prebuild.csproj +++ b/Prebuild/src/Prebuild.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
5 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
6 | <ProjectGuid>{1C3A6B91-4AE9-440A-B0E0-E847681BF6D0}</ProjectGuid> | 6 | <ProjectGuid>{92E80C1C-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon>App.ico</ApplicationIcon> | 9 | <ApplicationIcon>App.ico</ApplicationIcon> |