aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2007-06-28 08:40:31 +0000
committerAdam Frisby2007-06-28 08:40:31 +0000
commit1ff47941919dc73b668d8eef07c8c9dd24d60969 (patch)
treee13457588efab35a0e41b35e41701631c393c00b
parentShiny commit (finally) (diff)
downloadopensim-SC-1ff47941919dc73b668d8eef07c8c9dd24d60969.zip
opensim-SC-1ff47941919dc73b668d8eef07c8c9dd24d60969.tar.gz
opensim-SC-1ff47941919dc73b668d8eef07c8c9dd24d60969.tar.bz2
opensim-SC-1ff47941919dc73b668d8eef07c8c9dd24d60969.tar.xz
* Run prebuild, and stuff. (Fixed bug)
Diffstat (limited to '')
-rw-r--r--Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj50
-rw-r--r--Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj37
-rw-r--r--Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build1
-rw-r--r--Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user2
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.csproj52
-rw-r--r--Common/OpenSim.Servers/OpenSim.Servers.csproj46
-rw-r--r--OpenGridServices.sln126
-rw-r--r--OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj55
-rw-r--r--OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build2
-rw-r--r--OpenSim/OpenSim.Region/OpenSim.Region.csproj95
-rw-r--r--OpenSim/OpenSim.Region/OpenSim.Region.dll.build13
-rw-r--r--OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj46
-rw-r--r--OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build2
-rw-r--r--prebuild.xml1
14 files changed, 270 insertions, 258 deletions
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj b/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
index 00246e1..804ddba 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
+++ b/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,8 +6,7 @@
6 <ProjectGuid>{17442AF1-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{17442AF1-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> 9 <ApplicationIcon></ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
13 <AssemblyName>OpenGrid.Framework.Communications.OGS1</AssemblyName> 12 <AssemblyName>OpenGrid.Framework.Communications.OGS1</AssemblyName>
@@ -16,11 +15,9 @@
16 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
18 <OutputType>Library</OutputType> 17 <OutputType>Library</OutputType>
19 <AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenGrid.Framework.Communications.OGS1</RootNamespace> 19 <RootNamespace>OpenGrid.Framework.Communications.OGS1</RootNamespace>
22 <StartupObject> 20 <StartupObject></StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags> 21 <FileUpgradeFlags>
25 </FileUpgradeFlags> 22 </FileUpgradeFlags>
26 </PropertyGroup> 23 </PropertyGroup>
@@ -31,8 +28,7 @@
31 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile> 31 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
41 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
44 <NoWarn> 40 <NoWarn></NoWarn>
45 </NoWarn>
46 </PropertyGroup> 41 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
51 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile> 49 <DocumentationFile></DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
@@ -61,24 +55,26 @@
61 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
64 <NoWarn> 58 <NoWarn></NoWarn>
65 </NoWarn>
66 </PropertyGroup> 59 </PropertyGroup>
67 <ItemGroup> 60 <ItemGroup>
68 <Reference Include="libsecondlife.dll"> 61 <Reference Include="libsecondlife.dll" >
69 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 62 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
70 <Private>False</Private> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="System"> 65 <Reference Include="System" >
73 <HintPath>System.dll</HintPath> 66 <HintPath>System.dll</HintPath>
74 <Private>False</Private> 67 <Private>False</Private>
75 </Reference> 68 </Reference>
76 <Reference Include="System.Data"> 69 <Reference Include="System.Data" >
77 <HintPath>System.Data.dll</HintPath> 70 <HintPath>System.Data.dll</HintPath>
78 <Private>False</Private> 71 <Private>False</Private>
79 </Reference> 72 </Reference>
80 <Reference Include="System.Runtime.Remoting" /> 73 <Reference Include="System.Runtime.Remoting" >
81 <Reference Include="System.Xml"> 74 <HintPath>System.Runtime.Remoting.dll</HintPath>
75 <Private>False</Private>
76 </Reference>
77 <Reference Include="System.Xml" >
82 <HintPath>System.Xml.dll</HintPath> 78 <HintPath>System.Xml.dll</HintPath>
83 <Private>False</Private> 79 <Private>False</Private>
84 </Reference> 80 </Reference>
@@ -88,37 +84,37 @@
88 <Name>OpenGrid.Framework.Communications</Name> 84 <Name>OpenGrid.Framework.Communications</Name>
89 <Project>{683344D5-0000-0000-0000-000000000000}</Project> 85 <Project>{683344D5-0000-0000-0000-000000000000}</Project>
90 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
91 <Private>False</Private> 87 <Private>False</Private>
92 </ProjectReference> 88 </ProjectReference>
93 <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj"> 89 <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
94 <Name>OpenGrid.Framework.Data</Name> 90 <Name>OpenGrid.Framework.Data</Name>
95 <Project>{62CDF671-0000-0000-0000-000000000000}</Project> 91 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
96 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
97 <Private>False</Private> 93 <Private>False</Private>
98 </ProjectReference> 94 </ProjectReference>
99 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> 95 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
100 <Name>OpenSim.Framework</Name> 96 <Name>OpenSim.Framework</Name>
101 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 97 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
102 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
103 <Private>False</Private> 99 <Private>False</Private>
104 </ProjectReference> 100 </ProjectReference>
105 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 101 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
106 <Name>OpenSim.Framework.Console</Name> 102 <Name>OpenSim.Framework.Console</Name>
107 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 103 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
108 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 104 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
109 <Private>False</Private> 105 <Private>False</Private>
110 </ProjectReference> 106 </ProjectReference>
111 <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj"> 107 <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj">
112 <Name>OpenSim.Servers</Name> 108 <Name>OpenSim.Servers</Name>
113 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> 109 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
114 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 110 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
115 <Private>False</Private> 111 <Private>False</Private>
116 </ProjectReference> 112 </ProjectReference>
117 <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj"> 113 <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
118 <Name>XMLRPC</Name> 114 <Name>XMLRPC</Name>
119 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> 115 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
120 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 116 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
121 <Private>False</Private> 117 <Private>False</Private>
122 </ProjectReference> 118 </ProjectReference>
123 </ItemGroup> 119 </ItemGroup>
124 <ItemGroup> 120 <ItemGroup>
@@ -145,4 +141,4 @@
145 <PostBuildEvent> 141 <PostBuildEvent>
146 </PostBuildEvent> 142 </PostBuildEvent>
147 </PropertyGroup> 143 </PropertyGroup>
148</Project> \ No newline at end of file 144</Project>
diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
index d99b012..048722a 100644
--- a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
+++ b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,8 +6,7 @@
6 <ProjectGuid>{62CDF671-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{62CDF671-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> 9 <ApplicationIcon></ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
13 <AssemblyName>OpenGrid.Framework.Data</AssemblyName> 12 <AssemblyName>OpenGrid.Framework.Data</AssemblyName>
@@ -16,11 +15,9 @@
16 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
18 <OutputType>Library</OutputType> 17 <OutputType>Library</OutputType>
19 <AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenGrid.Framework.Data</RootNamespace> 19 <RootNamespace>OpenGrid.Framework.Data</RootNamespace>
22 <StartupObject> 20 <StartupObject></StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags> 21 <FileUpgradeFlags>
25 </FileUpgradeFlags> 22 </FileUpgradeFlags>
26 </PropertyGroup> 23 </PropertyGroup>
@@ -31,8 +28,7 @@
31 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile> 31 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
41 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
44 <NoWarn> 40 <NoWarn></NoWarn>
45 </NoWarn>
46 </PropertyGroup> 41 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
51 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile> 49 <DocumentationFile></DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
@@ -61,23 +55,22 @@
61 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
64 <NoWarn> 58 <NoWarn></NoWarn>
65 </NoWarn>
66 </PropertyGroup> 59 </PropertyGroup>
67 <ItemGroup> 60 <ItemGroup>
68 <Reference Include="libsecondlife.dll"> 61 <Reference Include="libsecondlife.dll" >
69 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 62 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
70 <Private>False</Private> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="System"> 65 <Reference Include="System" >
73 <HintPath>System.dll</HintPath> 66 <HintPath>System.dll</HintPath>
74 <Private>False</Private> 67 <Private>False</Private>
75 </Reference> 68 </Reference>
76 <Reference Include="System.Data"> 69 <Reference Include="System.Data" >
77 <HintPath>System.Data.dll</HintPath> 70 <HintPath>System.Data.dll</HintPath>
78 <Private>False</Private> 71 <Private>False</Private>
79 </Reference> 72 </Reference>
80 <Reference Include="System.Xml"> 73 <Reference Include="System.Xml" >
81 <HintPath>System.Xml.dll</HintPath> 74 <HintPath>System.Xml.dll</HintPath>
82 <Private>False</Private> 75 <Private>False</Private>
83 </Reference> 76 </Reference>
@@ -97,7 +90,9 @@
97 <Compile Include="InventoryData.cs"> 90 <Compile Include="InventoryData.cs">
98 <SubType>Code</SubType> 91 <SubType>Code</SubType>
99 </Compile> 92 </Compile>
100 <Compile Include="ReservationData.cs" /> 93 <Compile Include="ReservationData.cs">
94 <SubType>Code</SubType>
95 </Compile>
101 <Compile Include="SimProfileData.cs"> 96 <Compile Include="SimProfileData.cs">
102 <SubType>Code</SubType> 97 <SubType>Code</SubType>
103 </Compile> 98 </Compile>
@@ -118,4 +113,4 @@
118 <PostBuildEvent> 113 <PostBuildEvent>
119 </PostBuildEvent> 114 </PostBuildEvent>
120 </PropertyGroup> 115 </PropertyGroup>
121</Project> \ No newline at end of file 116</Project>
diff --git a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
index 7abebeb..764e871 100644
--- a/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
+++ b/Common/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build
@@ -15,6 +15,7 @@
15 <include name="ILogData.cs" /> 15 <include name="ILogData.cs" />
16 <include name="IniConfig.cs" /> 16 <include name="IniConfig.cs" />
17 <include name="InventoryData.cs" /> 17 <include name="InventoryData.cs" />
18 <include name="ReservationData.cs" />
18 <include name="SimProfileData.cs" /> 19 <include name="SimProfileData.cs" />
19 <include name="UserData.cs" /> 20 <include name="UserData.cs" />
20 <include name="UserProfileData.cs" /> 21 <include name="UserProfileData.cs" />
diff --git a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user
index 5941547..ae8a33c 100644
--- a/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user
+++ b/Common/OpenGrid.Framework.UserManager/OpenGrid.Framework.UserManagement.csproj.user
@@ -2,7 +2,7 @@
2 <PropertyGroup> 2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-06\Sugilite\bin\</ReferencePath> 5 <ReferencePath>E:\work\oslauth\sim\branches\Sugilite\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion> 6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView> 7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust> 8 <ProjectTrust>0</ProjectTrust>
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index ac0b195..3b938cb 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,8 +6,7 @@
6 <ProjectGuid>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{8ACA2445-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> 9 <ApplicationIcon></ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
13 <AssemblyName>OpenSim.Framework</AssemblyName> 12 <AssemblyName>OpenSim.Framework</AssemblyName>
@@ -16,11 +15,9 @@
16 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
18 <OutputType>Library</OutputType> 17 <OutputType>Library</OutputType>
19 <AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenSim.Framework</RootNamespace> 19 <RootNamespace>OpenSim.Framework</RootNamespace>
22 <StartupObject> 20 <StartupObject></StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags> 21 <FileUpgradeFlags>
25 </FileUpgradeFlags> 22 </FileUpgradeFlags>
26 </PropertyGroup> 23 </PropertyGroup>
@@ -31,8 +28,7 @@
31 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile> 31 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
41 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
44 <NoWarn> 40 <NoWarn></NoWarn>
45 </NoWarn>
46 </PropertyGroup> 41 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
51 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile> 49 <DocumentationFile></DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
@@ -61,24 +55,22 @@
61 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
64 <NoWarn> 58 <NoWarn></NoWarn>
65 </NoWarn>
66 </PropertyGroup> 59 </PropertyGroup>
67 <ItemGroup> 60 <ItemGroup>
68 <Reference Include="Db4objects.Db4o.dll"> 61 <Reference Include="Db4objects.Db4o.dll" >
69 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> 62 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
70 <Private>False</Private> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="libsecondlife.dll"> 65 <Reference Include="libsecondlife.dll" >
73 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 66 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
74 <Private>False</Private> 67 <Private>False</Private>
75 </Reference> 68 </Reference>
76 <Reference Include="System"> 69 <Reference Include="System" >
77 <HintPath>System.dll</HintPath> 70 <HintPath>System.dll</HintPath>
78 <Private>False</Private> 71 <Private>False</Private>
79 </Reference> 72 </Reference>
80 <Reference Include="System.Data" /> 73 <Reference Include="System.Xml" >
81 <Reference Include="System.Xml">
82 <HintPath>System.Xml.dll</HintPath> 74 <HintPath>System.Xml.dll</HintPath>
83 <Private>False</Private> 75 <Private>False</Private>
84 </Reference> 76 </Reference>
@@ -88,13 +80,13 @@
88 <Name>OpenSim.Framework.Console</Name> 80 <Name>OpenSim.Framework.Console</Name>
89 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 81 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
90 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
91 <Private>False</Private> 83 <Private>False</Private>
92 </ProjectReference> 84 </ProjectReference>
93 <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj"> 85 <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
94 <Name>XMLRPC</Name> 86 <Name>XMLRPC</Name>
95 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> 87 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
96 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 88 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
97 <Private>False</Private> 89 <Private>False</Private>
98 </ProjectReference> 90 </ProjectReference>
99 </ItemGroup> 91 </ItemGroup>
100 <ItemGroup> 92 <ItemGroup>
@@ -110,7 +102,9 @@
110 <Compile Include="IRegionCommsListener.cs"> 102 <Compile Include="IRegionCommsListener.cs">
111 <SubType>Code</SubType> 103 <SubType>Code</SubType>
112 </Compile> 104 </Compile>
113 <Compile Include="LLSDHelpers.cs" /> 105 <Compile Include="LLSDHelpers.cs">
106 <SubType>Code</SubType>
107 </Compile>
114 <Compile Include="Logger.cs"> 108 <Compile Include="Logger.cs">
115 <SubType>Code</SubType> 109 <SubType>Code</SubType>
116 </Compile> 110 </Compile>
@@ -126,7 +120,15 @@
126 <Compile Include="SimProfile.cs"> 120 <Compile Include="SimProfile.cs">
127 <SubType>Code</SubType> 121 <SubType>Code</SubType>
128 </Compile> 122 </Compile>
129 <Compile Include="UserProfile.cs" /> 123 <Compile Include="UserProfile.cs">
124 <SubType>Code</SubType>
125 </Compile>
126 <Compile Include="UserProfileManager.cs">
127 <SubType>Code</SubType>
128 </Compile>
129 <Compile Include="UserProfileManagerBase.cs">
130 <SubType>Code</SubType>
131 </Compile>
130 <Compile Include="Util.cs"> 132 <Compile Include="Util.cs">
131 <SubType>Code</SubType> 133 <SubType>Code</SubType>
132 </Compile> 134 </Compile>
@@ -216,4 +218,4 @@
216 <PostBuildEvent> 218 <PostBuildEvent>
217 </PostBuildEvent> 219 </PostBuildEvent>
218 </PropertyGroup> 220 </PropertyGroup>
219</Project> \ No newline at end of file 221</Project>
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj
index 6e8eba7..e9be796 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj
+++ b/Common/OpenSim.Servers/OpenSim.Servers.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,8 +6,7 @@
6 <ProjectGuid>{8BB20F0A-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{8BB20F0A-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> 9 <ApplicationIcon></ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
13 <AssemblyName>OpenSim.Servers</AssemblyName> 12 <AssemblyName>OpenSim.Servers</AssemblyName>
@@ -16,11 +15,9 @@
16 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
18 <OutputType>Library</OutputType> 17 <OutputType>Library</OutputType>
19 <AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenSim.Servers</RootNamespace> 19 <RootNamespace>OpenSim.Servers</RootNamespace>
22 <StartupObject> 20 <StartupObject></StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags> 21 <FileUpgradeFlags>
25 </FileUpgradeFlags> 22 </FileUpgradeFlags>
26 </PropertyGroup> 23 </PropertyGroup>
@@ -31,8 +28,7 @@
31 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile> 31 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
41 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
44 <NoWarn> 40 <NoWarn></NoWarn>
45 </NoWarn>
46 </PropertyGroup> 41 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
51 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile> 49 <DocumentationFile></DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
@@ -61,19 +55,18 @@
61 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
64 <NoWarn> 58 <NoWarn></NoWarn>
65 </NoWarn>
66 </PropertyGroup> 59 </PropertyGroup>
67 <ItemGroup> 60 <ItemGroup>
68 <Reference Include="libsecondlife.dll"> 61 <Reference Include="libsecondlife.dll" >
69 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 62 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
70 <Private>False</Private> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="System"> 65 <Reference Include="System" >
73 <HintPath>System.dll</HintPath> 66 <HintPath>System.dll</HintPath>
74 <Private>False</Private> 67 <Private>False</Private>
75 </Reference> 68 </Reference>
76 <Reference Include="System.Xml"> 69 <Reference Include="System.Xml" >
77 <HintPath>System.Xml.dll</HintPath> 70 <HintPath>System.Xml.dll</HintPath>
78 <Private>False</Private> 71 <Private>False</Private>
79 </Reference> 72 </Reference>
@@ -83,19 +76,19 @@
83 <Name>OpenSim.Framework</Name> 76 <Name>OpenSim.Framework</Name>
84 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 77 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
85 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
86 <Private>False</Private> 79 <Private>False</Private>
87 </ProjectReference> 80 </ProjectReference>
88 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 81 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
89 <Name>OpenSim.Framework.Console</Name> 82 <Name>OpenSim.Framework.Console</Name>
90 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 83 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
91 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 84 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
92 <Private>False</Private> 85 <Private>False</Private>
93 </ProjectReference> 86 </ProjectReference>
94 <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj"> 87 <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
95 <Name>XMLRPC</Name> 88 <Name>XMLRPC</Name>
96 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> 89 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
97 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 90 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
98 <Private>False</Private> 91 <Private>False</Private>
99 </ProjectReference> 92 </ProjectReference>
100 </ItemGroup> 93 </ItemGroup>
101 <ItemGroup> 94 <ItemGroup>
@@ -108,6 +101,15 @@
108 <Compile Include="IRestHandler.cs"> 101 <Compile Include="IRestHandler.cs">
109 <SubType>Code</SubType> 102 <SubType>Code</SubType>
110 </Compile> 103 </Compile>
104 <Compile Include="LocalUserProfileManager.cs">
105 <SubType>Code</SubType>
106 </Compile>
107 <Compile Include="LoginResponse.cs">
108 <SubType>Code</SubType>
109 </Compile>
110 <Compile Include="LoginServer.cs">
111 <SubType>Code</SubType>
112 </Compile>
111 <Compile Include="UDPServerBase.cs"> 113 <Compile Include="UDPServerBase.cs">
112 <SubType>Code</SubType> 114 <SubType>Code</SubType>
113 </Compile> 115 </Compile>
@@ -122,4 +124,4 @@
122 <PostBuildEvent> 124 <PostBuildEvent>
123 </PostBuildEvent> 125 </PostBuildEvent>
124 </PropertyGroup> 126 </PropertyGroup>
125</Project> \ No newline at end of file 127</Project>
diff --git a/OpenGridServices.sln b/OpenGridServices.sln
index 4772960..e492872 100644
--- a/OpenGridServices.sln
+++ b/OpenGridServices.sln
@@ -1,5 +1,5 @@
1Microsoft Visual Studio Solution File, Format Version 9.00 1Microsoft Visual Studio Solution File, Format Version 9.00
2# Visual C# Express 2005 2# Visual Studio 2005
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Config.GridConfigDb4o", "OpenGridServices\OpenGrid.Config\GridConfigDb4o\OpenGrid.Config.GridConfigDb4o.csproj", "{B0027747-0000-0000-0000-000000000000}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Config.GridConfigDb4o", "OpenGridServices\OpenGrid.Config\GridConfigDb4o\OpenGrid.Config.GridConfigDb4o.csproj", "{B0027747-0000-0000-0000-000000000000}"
4EndProject 4EndProject
5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data", "Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj", "{62CDF671-0000-0000-0000-000000000000}" 5Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data", "Common\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj", "{62CDF671-0000-0000-0000-000000000000}"
@@ -25,61 +25,71 @@ EndProject
25Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}" 25Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}"
26EndProject 26EndProject
27Global 27Global
28 GlobalSection(SolutionConfigurationPlatforms) = preSolution 28 GlobalSection(SolutionConfigurationPlatforms) = preSolution
29 Debug|Any CPU = Debug|Any CPU 29 Debug|Any CPU = Debug|Any CPU
30 Release|Any CPU = Release|Any CPU 30 Release|Any CPU = Release|Any CPU
31 EndGlobalSection 31 EndGlobalSection
32 GlobalSection(ProjectConfigurationPlatforms) = postSolution 32 GlobalSection(ProjectDependencies) = postSolution
33 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 33 ({39BD9497-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
34 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 34 ({0A563AC1-0000-0000-0000-000000000000}).1 = ({62CDF671-0000-0000-0000-000000000000})
35 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 35 ({0F3C3AC1-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
36 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 36 ({1E3F341A-0000-0000-0000-000000000000}).1 = ({62CDF671-0000-0000-0000-000000000000})
37 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 37 ({DA9A7391-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
38 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 38 ({21BFC8E2-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
39 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 39 ({21BFC8E2-0000-0000-0000-000000000000}).3 = ({7924FD35-0000-0000-0000-000000000000})
40 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 40 ({66591469-0000-0000-0000-000000000000}).2 = ({62CDF671-0000-0000-0000-000000000000})
41 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 41 EndGlobalSection
42 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 42 GlobalSection(ProjectConfigurationPlatforms) = postSolution
43 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 43 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
44 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 44 {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
45 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 45 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
46 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 46 {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
47 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 47 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
48 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 48 {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
49 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 49 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
50 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 50 {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
51 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 51 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
52 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 52 {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
53 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 53 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
54 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 54 {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
55 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 55 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
56 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 56 {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
57 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 57 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
58 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 58 {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
59 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 59 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
60 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 60 {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
61 {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 61 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
62 {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 62 {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
63 {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 63 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
64 {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 64 {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
65 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 65 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
66 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 66 {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
67 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 67 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 68 {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
69 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 69 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
70 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 70 {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
71 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 71 {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
72 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 72 {DA9A7391-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
73 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 73 {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
74 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 74 {DA9A7391-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
75 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 75 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
76 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 76 {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
77 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 77 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
78 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 78 {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
79 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 79 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
80 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 80 {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
81 EndGlobalSection 81 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
82 GlobalSection(SolutionProperties) = preSolution 82 {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
83 HideSolutionNode = FALSE 83 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
84 EndGlobalSection 84 {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
85 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
86 {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
87 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
88 {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
89 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
90 {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
91 EndGlobalSection
92 GlobalSection(SolutionProperties) = preSolution
93 HideSolutionNode = FALSE
94 EndGlobalSection
85EndGlobal 95EndGlobal
diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
index 32368c5..ad0080a 100644
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
+++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,8 +6,7 @@
6 <ProjectGuid>{66591469-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{66591469-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> 9 <ApplicationIcon></ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
13 <AssemblyName>OpenGridServices.UserServer</AssemblyName> 12 <AssemblyName>OpenGridServices.UserServer</AssemblyName>
@@ -16,11 +15,9 @@
16 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
18 <OutputType>Exe</OutputType> 17 <OutputType>Exe</OutputType>
19 <AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenGridServices.UserServer</RootNamespace> 19 <RootNamespace>OpenGridServices.UserServer</RootNamespace>
22 <StartupObject> 20 <StartupObject></StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags> 21 <FileUpgradeFlags>
25 </FileUpgradeFlags> 22 </FileUpgradeFlags>
26 </PropertyGroup> 23 </PropertyGroup>
@@ -31,8 +28,7 @@
31 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile> 31 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
41 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
44 <NoWarn> 40 <NoWarn></NoWarn>
45 </NoWarn>
46 </PropertyGroup> 41 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
51 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile> 49 <DocumentationFile></DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
@@ -61,47 +55,50 @@
61 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
64 <NoWarn> 58 <NoWarn></NoWarn>
65 </NoWarn>
66 </PropertyGroup> 59 </PropertyGroup>
67 <ItemGroup> 60 <ItemGroup>
68 <Reference Include="Db4objects.Db4o.dll"> 61 <Reference Include="Db4objects.Db4o.dll" >
69 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> 62 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
70 <Private>False</Private> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="libsecondlife.dll"> 65 <Reference Include="libsecondlife.dll" >
73 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 66 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
74 <Private>False</Private> 67 <Private>False</Private>
75 </Reference> 68 </Reference>
76 <Reference Include="OpenSim.Framework"> 69 <Reference Include="OpenGrid.Framework.UserManager" >
70 <HintPath>OpenGrid.Framework.UserManager.dll</HintPath>
71 <Private>False</Private>
72 </Reference>
73 <Reference Include="OpenSim.Framework" >
77 <HintPath>OpenSim.Framework.dll</HintPath> 74 <HintPath>OpenSim.Framework.dll</HintPath>
78 <Private>False</Private> 75 <Private>False</Private>
79 </Reference> 76 </Reference>
80 <Reference Include="OpenSim.Framework.Console"> 77 <Reference Include="OpenSim.Framework.Console" >
81 <HintPath>OpenSim.Framework.Console.dll</HintPath> 78 <HintPath>OpenSim.Framework.Console.dll</HintPath>
82 <Private>False</Private> 79 <Private>False</Private>
83 </Reference> 80 </Reference>
84 <Reference Include="OpenSim.GenericConfig.Xml"> 81 <Reference Include="OpenSim.GenericConfig.Xml" >
85 <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath> 82 <HintPath>OpenSim.GenericConfig.Xml.dll</HintPath>
86 <Private>False</Private> 83 <Private>False</Private>
87 </Reference> 84 </Reference>
88 <Reference Include="OpenSim.Servers"> 85 <Reference Include="OpenSim.Servers" >
89 <HintPath>OpenSim.Servers.dll</HintPath> 86 <HintPath>OpenSim.Servers.dll</HintPath>
90 <Private>False</Private> 87 <Private>False</Private>
91 </Reference> 88 </Reference>
92 <Reference Include="System"> 89 <Reference Include="System" >
93 <HintPath>System.dll</HintPath> 90 <HintPath>System.dll</HintPath>
94 <Private>False</Private> 91 <Private>False</Private>
95 </Reference> 92 </Reference>
96 <Reference Include="System.Data"> 93 <Reference Include="System.Data" >
97 <HintPath>System.Data.dll</HintPath> 94 <HintPath>System.Data.dll</HintPath>
98 <Private>False</Private> 95 <Private>False</Private>
99 </Reference> 96 </Reference>
100 <Reference Include="System.Xml"> 97 <Reference Include="System.Xml" >
101 <HintPath>System.Xml.dll</HintPath> 98 <HintPath>System.Xml.dll</HintPath>
102 <Private>False</Private> 99 <Private>False</Private>
103 </Reference> 100 </Reference>
104 <Reference Include="XMLRPC"> 101 <Reference Include="XMLRPC" >
105 <HintPath>XMLRPC.dll</HintPath> 102 <HintPath>XMLRPC.dll</HintPath>
106 <Private>False</Private> 103 <Private>False</Private>
107 </Reference> 104 </Reference>
@@ -111,11 +108,7 @@
111 <Name>OpenGrid.Framework.Data</Name> 108 <Name>OpenGrid.Framework.Data</Name>
112 <Project>{62CDF671-0000-0000-0000-000000000000}</Project> 109 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
113 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 110 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
114 <Private>False</Private> 111 <Private>False</Private>
115 </ProjectReference>
116 <ProjectReference Include="..\..\Common\OpenGrid.Framework.UserManager\OpenGrid.Framework.UserManagement.csproj">
117 <Project>{DA9A7391-0000-0000-0000-000000000000}</Project>
118 <Name>OpenGrid.Framework.UserManagement</Name>
119 </ProjectReference> 112 </ProjectReference>
120 </ItemGroup> 113 </ItemGroup>
121 <ItemGroup> 114 <ItemGroup>
@@ -136,4 +129,4 @@
136 <PostBuildEvent> 129 <PostBuildEvent>
137 </PostBuildEvent> 130 </PostBuildEvent>
138 </PropertyGroup> 131 </PropertyGroup>
139</Project> \ No newline at end of file 132</Project>
diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
index a24003f..d262947 100644
--- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
+++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
@@ -23,7 +23,7 @@
23 <include name="../../bin/Db4objects.Db4o.dll" /> 23 <include name="../../bin/Db4objects.Db4o.dll" />
24 <include name="../../bin/libsecondlife.dll" /> 24 <include name="../../bin/libsecondlife.dll" />
25 <include name="../../bin/OpenGrid.Framework.Data.dll" /> 25 <include name="../../bin/OpenGrid.Framework.Data.dll" />
26 <include name="../../bin/OpenGrid.Framework.UserManager.dll" /> 26 <include name="OpenGrid.Framework.UserManager.dll" />
27 <include name="../../bin/OpenSim.Framework.dll" /> 27 <include name="../../bin/OpenSim.Framework.dll" />
28 <include name="../../bin/OpenSim.Framework.Console.dll" /> 28 <include name="../../bin/OpenSim.Framework.Console.dll" />
29 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" /> 29 <include name="../../bin/OpenSim.GenericConfig.Xml.dll" />
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 4131142..79f204d 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,8 +6,7 @@
6 <ProjectGuid>{196916AF-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{196916AF-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> 9 <ApplicationIcon></ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
13 <AssemblyName>OpenSim.Region</AssemblyName> 12 <AssemblyName>OpenSim.Region</AssemblyName>
@@ -16,11 +15,9 @@
16 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
18 <OutputType>Library</OutputType> 17 <OutputType>Library</OutputType>
19 <AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenSim.Region</RootNamespace> 19 <RootNamespace>OpenSim.Region</RootNamespace>
22 <StartupObject> 20 <StartupObject></StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags> 21 <FileUpgradeFlags>
25 </FileUpgradeFlags> 22 </FileUpgradeFlags>
26 </PropertyGroup> 23 </PropertyGroup>
@@ -31,8 +28,7 @@
31 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile> 31 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
41 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
44 <NoWarn> 40 <NoWarn></NoWarn>
45 </NoWarn>
46 </PropertyGroup> 41 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
51 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile> 49 <DocumentationFile></DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
@@ -61,88 +55,92 @@
61 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
64 <NoWarn> 58 <NoWarn></NoWarn>
65 </NoWarn>
66 </PropertyGroup> 59 </PropertyGroup>
67 <ItemGroup> 60 <ItemGroup>
68 <Reference Include="Axiom.MathLib.dll"> 61 <Reference Include="Axiom.MathLib.dll" >
69 <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> 62 <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>
70 <Private>False</Private> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="Db4objects.Db4o.dll"> 65 <Reference Include="Db4objects.Db4o.dll" >
73 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> 66 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
74 <Private>False</Private> 67 <Private>False</Private>
75 </Reference> 68 </Reference>
76 <Reference Include="libsecondlife.dll"> 69 <Reference Include="libsecondlife.dll" >
77 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 70 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
78 <Private>False</Private> 71 <Private>False</Private>
79 </Reference> 72 </Reference>
80 <Reference Include="Microsoft.JScript" /> 73 <Reference Include="Microsoft.JScript" >
81 <Reference Include="System"> 74 <HintPath>Microsoft.JScript.dll</HintPath>
75 <Private>False</Private>
76 </Reference>
77 <Reference Include="System" >
82 <HintPath>System.dll</HintPath> 78 <HintPath>System.dll</HintPath>
83 <Private>False</Private> 79 <Private>False</Private>
84 </Reference> 80 </Reference>
85 <Reference Include="System.Data" /> 81 <Reference Include="System.Xml" >
86 <Reference Include="System.Xml">
87 <HintPath>System.Xml.dll</HintPath> 82 <HintPath>System.Xml.dll</HintPath>
88 <Private>False</Private> 83 <Private>False</Private>
89 </Reference> 84 </Reference>
90 <Reference Include="VJSharpCodeProvider" /> 85 <Reference Include="VJSharpCodeProvider" >
86 <HintPath>VJSharpCodeProvider.dll</HintPath>
87 <Private>False</Private>
88 </Reference>
91 </ItemGroup> 89 </ItemGroup>
92 <ItemGroup> 90 <ItemGroup>
93 <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj"> 91 <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj">
94 <Name>OpenGrid.Framework.Communications</Name> 92 <Name>OpenGrid.Framework.Communications</Name>
95 <Project>{683344D5-0000-0000-0000-000000000000}</Project> 93 <Project>{683344D5-0000-0000-0000-000000000000}</Project>
96 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 94 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
97 <Private>False</Private> 95 <Private>False</Private>
98 </ProjectReference> 96 </ProjectReference>
99 <ProjectReference Include="..\OpenSim.Caches\OpenSim.Caches.csproj"> 97 <ProjectReference Include="..\OpenSim.Caches\OpenSim.Caches.csproj">
100 <Name>OpenSim.Caches</Name> 98 <Name>OpenSim.Caches</Name>
101 <Project>{1938EB12-0000-0000-0000-000000000000}</Project> 99 <Project>{1938EB12-0000-0000-0000-000000000000}</Project>
102 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 100 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
103 <Private>False</Private> 101 <Private>False</Private>
104 </ProjectReference> 102 </ProjectReference>
105 <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> 103 <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
106 <Name>OpenSim.Framework</Name> 104 <Name>OpenSim.Framework</Name>
107 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 105 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
108 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 106 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
109 <Private>False</Private> 107 <Private>False</Private>
110 </ProjectReference> 108 </ProjectReference>
111 <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 109 <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
112 <Name>OpenSim.Framework.Console</Name> 110 <Name>OpenSim.Framework.Console</Name>
113 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 111 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
114 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 112 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
115 <Private>False</Private> 113 <Private>False</Private>
116 </ProjectReference> 114 </ProjectReference>
117 <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj"> 115 <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">
118 <Name>OpenSim.GenericConfig.Xml</Name> 116 <Name>OpenSim.GenericConfig.Xml</Name>
119 <Project>{E88EF749-0000-0000-0000-000000000000}</Project> 117 <Project>{E88EF749-0000-0000-0000-000000000000}</Project>
120 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 118 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
121 <Private>False</Private> 119 <Private>False</Private>
122 </ProjectReference> 120 </ProjectReference>
123 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> 121 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
124 <Name>OpenSim.Physics.Manager</Name> 122 <Name>OpenSim.Physics.Manager</Name>
125 <Project>{8BE16150-0000-0000-0000-000000000000}</Project> 123 <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
126 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 124 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
127 <Private>False</Private> 125 <Private>False</Private>
128 </ProjectReference> 126 </ProjectReference>
129 <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> 127 <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">
130 <Name>OpenSim.Servers</Name> 128 <Name>OpenSim.Servers</Name>
131 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> 129 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
132 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 130 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
133 <Private>False</Private> 131 <Private>False</Private>
134 </ProjectReference> 132 </ProjectReference>
135 <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj"> 133 <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj">
136 <Name>OpenSim.Terrain.BasicTerrain</Name> 134 <Name>OpenSim.Terrain.BasicTerrain</Name>
137 <Project>{2270B8FE-0000-0000-0000-000000000000}</Project> 135 <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>
138 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 136 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
139 <Private>False</Private> 137 <Private>False</Private>
140 </ProjectReference> 138 </ProjectReference>
141 <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj"> 139 <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj">
142 <Name>XMLRPC</Name> 140 <Name>XMLRPC</Name>
143 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> 141 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
144 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 142 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
145 <Private>False</Private> 143 <Private>False</Private>
146 </ProjectReference> 144 </ProjectReference>
147 </ItemGroup> 145 </ItemGroup>
148 <ItemGroup> 146 <ItemGroup>
@@ -179,7 +177,9 @@
179 <Compile Include="Scenes\SceneBase.cs"> 177 <Compile Include="Scenes\SceneBase.cs">
180 <SubType>Code</SubType> 178 <SubType>Code</SubType>
181 </Compile> 179 </Compile>
182 <Compile Include="Scenes\SceneEvents.cs" /> 180 <Compile Include="Scenes\SceneEvents.cs">
181 <SubType>Code</SubType>
182 </Compile>
183 <Compile Include="Scenes\SceneObject.cs"> 183 <Compile Include="Scenes\SceneObject.cs">
184 <SubType>Code</SubType> 184 <SubType>Code</SubType>
185 </Compile> 185 </Compile>
@@ -192,15 +192,24 @@
192 <Compile Include="Scenes\ScenePresence.cs"> 192 <Compile Include="Scenes\ScenePresence.cs">
193 <SubType>Code</SubType> 193 <SubType>Code</SubType>
194 </Compile> 194 </Compile>
195 <Compile Include="Scenes\Scripting\Engines\CSharpScriptEngine.cs" /> 195 <Compile Include="Scenes\scripting\Script.cs">
196 <Compile Include="Scenes\Scripting\Engines\JScriptEngine.cs" /> 196 <SubType>Code</SubType>
197 <Compile Include="Scenes\Scripting\Engines\JSharpScriptEngine.cs" /> 197 </Compile>
198 <Compile Include="Scenes\Scripting\Script.cs" /> 198 <Compile Include="Scenes\scripting\ScriptInfo.cs">
199 <Compile Include="Scenes\Scripting\ScriptInfo.cs" /> 199 <SubType>Code</SubType>
200 <Compile Include="Scenes\Scripting\ScriptManager.cs" /> 200 </Compile>
201 </ItemGroup> 201 <Compile Include="Scenes\scripting\ScriptManager.cs">
202 <ItemGroup> 202 <SubType>Code</SubType>
203 <Folder Include="Scenes\Scripting\CSharpScripts\" /> 203 </Compile>
204 <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs">
205 <SubType>Code</SubType>
206 </Compile>
207 <Compile Include="Scenes\scripting\Engines\JScriptEngine.cs">
208 <SubType>Code</SubType>
209 </Compile>
210 <Compile Include="Scenes\scripting\Engines\JSharpScriptEngine.cs">
211 <SubType>Code</SubType>
212 </Compile>
204 </ItemGroup> 213 </ItemGroup>
205 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> 214 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
206 <PropertyGroup> 215 <PropertyGroup>
@@ -209,4 +218,4 @@
209 <PostBuildEvent> 218 <PostBuildEvent>
210 </PostBuildEvent> 219 </PostBuildEvent>
211 </PropertyGroup> 220 </PropertyGroup>
212</Project> \ No newline at end of file 221</Project>
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index d2c3c2c..926b9ed 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
@@ -22,16 +22,17 @@
22 <include name="Scenes/Scene.PacketHandlers.cs" /> 22 <include name="Scenes/Scene.PacketHandlers.cs" />
23 <include name="Scenes/Scene.Scripting.cs" /> 23 <include name="Scenes/Scene.Scripting.cs" />
24 <include name="Scenes/SceneBase.cs" /> 24 <include name="Scenes/SceneBase.cs" />
25 <include name="Scenes/SceneEvents.cs" />
25 <include name="Scenes/SceneObject.cs" /> 26 <include name="Scenes/SceneObject.cs" />
26 <include name="Scenes/ScenePresence.Animations.cs" /> 27 <include name="Scenes/ScenePresence.Animations.cs" />
27 <include name="Scenes/ScenePresence.Body.cs" /> 28 <include name="Scenes/ScenePresence.Body.cs" />
28 <include name="Scenes/ScenePresence.cs" /> 29 <include name="Scenes/ScenePresence.cs" />
29 <include name="Scenes/scripting/IScriptContext.cs" />
30 <include name="Scenes/scripting/IScriptEntity.cs" />
31 <include name="Scenes/scripting/IScriptHandler.cs" />
32 <include name="Scenes/scripting/Script.cs" /> 30 <include name="Scenes/scripting/Script.cs" />
33 <include name="Scenes/scripting/ScriptFactory.cs" /> 31 <include name="Scenes/scripting/ScriptInfo.cs" />
34 <include name="Scenes/scripting/Scripts/FollowRandomAvatar.cs" /> 32 <include name="Scenes/scripting/ScriptManager.cs" />
33 <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" />
34 <include name="Scenes/scripting/Engines/JScriptEngine.cs" />
35 <include name="Scenes/scripting/Engines/JSharpScriptEngine.cs" />
35 </sources> 36 </sources>
36 <references basedir="${project::get-base-directory()}"> 37 <references basedir="${project::get-base-directory()}">
37 <lib> 38 <lib>
@@ -41,6 +42,7 @@
41 <include name="../../bin/Axiom.MathLib.dll" /> 42 <include name="../../bin/Axiom.MathLib.dll" />
42 <include name="../../bin/Db4objects.Db4o.dll" /> 43 <include name="../../bin/Db4objects.Db4o.dll" />
43 <include name="../../bin/libsecondlife.dll" /> 44 <include name="../../bin/libsecondlife.dll" />
45 <include name="Microsoft.JScript.dll" />
44 <include name="../../bin/OpenGrid.Framework.Communications.dll" /> 46 <include name="../../bin/OpenGrid.Framework.Communications.dll" />
45 <include name="../../bin/OpenSim.Caches.dll" /> 47 <include name="../../bin/OpenSim.Caches.dll" />
46 <include name="../../bin/OpenSim.Framework.dll" /> 48 <include name="../../bin/OpenSim.Framework.dll" />
@@ -51,6 +53,7 @@
51 <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" /> 53 <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" />
52 <include name="System.dll" /> 54 <include name="System.dll" />
53 <include name="System.Xml.dll" /> 55 <include name="System.Xml.dll" />
56 <include name="VJSharpCodeProvider.dll" />
54 <include name="../../bin/XMLRPC.dll" /> 57 <include name="../../bin/XMLRPC.dll" />
55 </references> 58 </references>
56 </csc> 59 </csc>
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
index 419880e..0469efe 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
+++ b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,8 +6,7 @@
6 <ProjectGuid>{2270B8FE-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{2270B8FE-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> 9 <ApplicationIcon></ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
13 <AssemblyName>OpenSim.Terrain.BasicTerrain</AssemblyName> 12 <AssemblyName>OpenSim.Terrain.BasicTerrain</AssemblyName>
@@ -16,11 +15,9 @@
16 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
18 <OutputType>Library</OutputType> 17 <OutputType>Library</OutputType>
19 <AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenSim.Terrain.BasicTerrain</RootNamespace> 19 <RootNamespace>OpenSim.Terrain.BasicTerrain</RootNamespace>
22 <StartupObject> 20 <StartupObject></StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags> 21 <FileUpgradeFlags>
25 </FileUpgradeFlags> 22 </FileUpgradeFlags>
26 </PropertyGroup> 23 </PropertyGroup>
@@ -31,8 +28,7 @@
31 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile> 31 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
41 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
44 <NoWarn> 40 <NoWarn></NoWarn>
45 </NoWarn>
46 </PropertyGroup> 41 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
51 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile> 49 <DocumentationFile></DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
@@ -61,32 +55,34 @@
61 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
64 <NoWarn> 58 <NoWarn></NoWarn>
65 </NoWarn>
66 </PropertyGroup> 59 </PropertyGroup>
67 <ItemGroup> 60 <ItemGroup>
68 <Reference Include="libTerrain-BSD.dll"> 61 <Reference Include="libTerrain-BSD.dll" >
69 <HintPath>..\..\bin\libTerrain-BSD.dll</HintPath> 62 <HintPath>..\..\bin\libTerrain-BSD.dll</HintPath>
70 <Private>False</Private> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="Microsoft.JScript" /> 65 <Reference Include="Microsoft.JScript" >
73 <Reference Include="openjpegnet.dll"> 66 <HintPath>Microsoft.JScript.dll</HintPath>
67 <Private>False</Private>
68 </Reference>
69 <Reference Include="openjpegnet.dll" >
74 <HintPath>..\..\bin\openjpegnet.dll</HintPath> 70 <HintPath>..\..\bin\openjpegnet.dll</HintPath>
75 <Private>False</Private> 71 <Private>False</Private>
76 </Reference> 72 </Reference>
77 <Reference Include="System"> 73 <Reference Include="System" >
78 <HintPath>System.dll</HintPath> 74 <HintPath>System.dll</HintPath>
79 <Private>False</Private> 75 <Private>False</Private>
80 </Reference> 76 </Reference>
81 <Reference Include="System.Data"> 77 <Reference Include="System.Data" >
82 <HintPath>System.Data.dll</HintPath> 78 <HintPath>System.Data.dll</HintPath>
83 <Private>False</Private> 79 <Private>False</Private>
84 </Reference> 80 </Reference>
85 <Reference Include="System.Drawing"> 81 <Reference Include="System.Drawing" >
86 <HintPath>System.Drawing.dll</HintPath> 82 <HintPath>System.Drawing.dll</HintPath>
87 <Private>False</Private> 83 <Private>False</Private>
88 </Reference> 84 </Reference>
89 <Reference Include="System.Xml"> 85 <Reference Include="System.Xml" >
90 <HintPath>System.Xml.dll</HintPath> 86 <HintPath>System.Xml.dll</HintPath>
91 <Private>False</Private> 87 <Private>False</Private>
92 </Reference> 88 </Reference>
@@ -97,10 +93,12 @@
97 <Compile Include="TerrainEngine.cs"> 93 <Compile Include="TerrainEngine.cs">
98 <SubType>Code</SubType> 94 <SubType>Code</SubType>
99 </Compile> 95 </Compile>
96 <Compile Include="TerrainFilter.cs">
97 <SubType>Code</SubType>
98 </Compile>
100 <Compile Include="Properties\AssemblyInfo.cs"> 99 <Compile Include="Properties\AssemblyInfo.cs">
101 <SubType>Code</SubType> 100 <SubType>Code</SubType>
102 </Compile> 101 </Compile>
103 <Compile Include="TerrainFilter.cs" />
104 </ItemGroup> 102 </ItemGroup>
105 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> 103 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
106 <PropertyGroup> 104 <PropertyGroup>
@@ -109,4 +107,4 @@
109 <PostBuildEvent> 107 <PostBuildEvent>
110 </PostBuildEvent> 108 </PostBuildEvent>
111 </PropertyGroup> 109 </PropertyGroup>
112</Project> \ No newline at end of file 110</Project>
diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
index 51cecb9..91dd6f5 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
+++ b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
@@ -12,6 +12,7 @@
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="TerrainEngine.cs" /> 14 <include name="TerrainEngine.cs" />
15 <include name="TerrainFilter.cs" />
15 <include name="Properties/AssemblyInfo.cs" /> 16 <include name="Properties/AssemblyInfo.cs" />
16 </sources> 17 </sources>
17 <references basedir="${project::get-base-directory()}"> 18 <references basedir="${project::get-base-directory()}">
@@ -20,6 +21,7 @@
20 <include name="${project::get-base-directory()}/${build.dir}" /> 21 <include name="${project::get-base-directory()}/${build.dir}" />
21 </lib> 22 </lib>
22 <include name="../../bin/libTerrain-BSD.dll" /> 23 <include name="../../bin/libTerrain-BSD.dll" />
24 <include name="Microsoft.JScript.dll" />
23 <include name="../../bin/openjpegnet.dll" /> 25 <include name="../../bin/openjpegnet.dll" />
24 <include name="System.dll" /> 26 <include name="System.dll" />
25 <include name="System.Data.dll" /> 27 <include name="System.Data.dll" />
diff --git a/prebuild.xml b/prebuild.xml
index 0fec29f..314465e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -407,6 +407,7 @@
407 <Reference name="System.Xml"/> 407 <Reference name="System.Xml"/>
408 <Reference name="libTerrain-BSD.dll"/> 408 <Reference name="libTerrain-BSD.dll"/>
409 <Reference name="openjpegnet.dll" /> 409 <Reference name="openjpegnet.dll" />
410 <Reference name="Microsoft.JScript"/>
410 411
411 <Files> 412 <Files>
412 <Match pattern="*.cs" recurse="true"/> 413 <Match pattern="*.cs" recurse="true"/>
generated by cgit v1.1 at 2024-12-16 12:14:17 +0000