diff options
Diffstat (limited to '')
32 files changed, 338 insertions, 386 deletions
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj index dcf09d9..b3fd574 100644 --- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj +++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.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>{683344D5-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{683344D5-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</AssemblyName> | 12 | <AssemblyName>OpenGrid.Framework.Communications</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</RootNamespace> | 19 | <RootNamespace>OpenGrid.Framework.Communications</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="System"> | 61 | <Reference Include="System" > |
69 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
70 | <Private>False</Private> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
72 | <Reference Include="System.Xml"> | 65 | <Reference Include="System.Xml" > |
73 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.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> |
@@ -83,50 +76,50 @@ | |||
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 | </ItemGroup> | 81 | </ItemGroup> |
89 | <ItemGroup> | 82 | <ItemGroup> |
90 | <Compile Include="RegionServerCommsLocal.cs"> | 83 | <Compile Include="RegionServerCommsOGS.cs"> |
91 | <SubType>Code</SubType> | 84 | <SubType>Code</SubType> |
92 | </Compile> | 85 | </Compile> |
93 | <Compile Include="RegionServerCommsManager.cs"> | 86 | <Compile Include="RegionServerCommsLocal.cs"> |
94 | <SubType>Code</SubType> | 87 | <SubType>Code</SubType> |
95 | </Compile> | 88 | </Compile> |
96 | <Compile Include="RegionServerCommsOGS.cs"> | 89 | <Compile Include="RegionServerCommsManager.cs"> |
97 | <SubType>Code</SubType> | 90 | <SubType>Code</SubType> |
98 | </Compile> | 91 | </Compile> |
99 | <Compile Include="LocalBackEndServices.cs"> | 92 | <Compile Include="LocalBackEndServices.cs"> |
100 | <SubType>Code</SubType> | 93 | <SubType>Code</SubType> |
101 | </Compile> | 94 | </Compile> |
102 | <Compile Include="GridServer\GridCommsManagerBase.cs"> | 95 | <Compile Include="UserServer\UserCommsManagerOGS.cs"> |
103 | <SubType>Code</SubType> | 96 | <SubType>Code</SubType> |
104 | </Compile> | 97 | </Compile> |
105 | <Compile Include="GridServer\GridCommsManagerLocal.cs"> | 98 | <Compile Include="UserServer\UserCommsManagerBase.cs"> |
106 | <SubType>Code</SubType> | 99 | <SubType>Code</SubType> |
107 | </Compile> | 100 | </Compile> |
108 | <Compile Include="GridServer\GridCommsManagerOGS.cs"> | 101 | <Compile Include="UserServer\UserCommsManagerLocal.cs"> |
109 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
110 | </Compile> | 103 | </Compile> |
111 | <Compile Include="InterSimComms\InterSimsCommsBase.cs"> | 104 | <Compile Include="GridServer\GridCommsManagerOGS.cs"> |
112 | <SubType>Code</SubType> | 105 | <SubType>Code</SubType> |
113 | </Compile> | 106 | </Compile> |
114 | <Compile Include="InterSimComms\InterSimsCommsLocal.cs"> | 107 | <Compile Include="GridServer\GridCommsManagerBase.cs"> |
115 | <SubType>Code</SubType> | 108 | <SubType>Code</SubType> |
116 | </Compile> | 109 | </Compile> |
117 | <Compile Include="InterSimComms\InterSimsCommsOGS.cs"> | 110 | <Compile Include="GridServer\GridCommsManagerLocal.cs"> |
118 | <SubType>Code</SubType> | 111 | <SubType>Code</SubType> |
119 | </Compile> | 112 | </Compile> |
120 | <Compile Include="Properties\AssemblyInfo.cs"> | 113 | <Compile Include="Properties\AssemblyInfo.cs"> |
121 | <SubType>Code</SubType> | 114 | <SubType>Code</SubType> |
122 | </Compile> | 115 | </Compile> |
123 | <Compile Include="UserServer\UserCommsManagerBase.cs"> | 116 | <Compile Include="InterSimComms\InterSimsCommsOGS.cs"> |
124 | <SubType>Code</SubType> | 117 | <SubType>Code</SubType> |
125 | </Compile> | 118 | </Compile> |
126 | <Compile Include="UserServer\UserCommsManagerLocal.cs"> | 119 | <Compile Include="InterSimComms\InterSimsCommsBase.cs"> |
127 | <SubType>Code</SubType> | 120 | <SubType>Code</SubType> |
128 | </Compile> | 121 | </Compile> |
129 | <Compile Include="UserServer\UserCommsManagerOGS.cs"> | 122 | <Compile Include="InterSimComms\InterSimsCommsLocal.cs"> |
130 | <SubType>Code</SubType> | 123 | <SubType>Code</SubType> |
131 | </Compile> | 124 | </Compile> |
132 | </ItemGroup> | 125 | </ItemGroup> |
@@ -137,4 +130,4 @@ | |||
137 | <PostBuildEvent> | 130 | <PostBuildEvent> |
138 | </PostBuildEvent> | 131 | </PostBuildEvent> |
139 | </PropertyGroup> | 132 | </PropertyGroup> |
140 | </Project> \ No newline at end of file | 133 | </Project> |
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build index 4036747..c46174c 100644 --- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build +++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build | |||
@@ -11,20 +11,20 @@ | |||
11 | <resources prefix="OpenGrid.Framework.Communications" dynamicprefix="true" > | 11 | <resources prefix="OpenGrid.Framework.Communications" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="LocalBackEndServices.cs" /> | 14 | <include name="RegionServerCommsOGS.cs" /> |
15 | <include name="RegionServerCommsLocal.cs" /> | 15 | <include name="RegionServerCommsLocal.cs" /> |
16 | <include name="RegionServerCommsManager.cs" /> | 16 | <include name="RegionServerCommsManager.cs" /> |
17 | <include name="RegionServerCommsOGS.cs" /> | 17 | <include name="LocalBackEndServices.cs" /> |
18 | <include name="UserServer/UserCommsManagerOGS.cs" /> | ||
19 | <include name="UserServer/UserCommsManagerBase.cs" /> | ||
20 | <include name="UserServer/UserCommsManagerLocal.cs" /> | ||
21 | <include name="GridServer/GridCommsManagerOGS.cs" /> | ||
18 | <include name="GridServer/GridCommsManagerBase.cs" /> | 22 | <include name="GridServer/GridCommsManagerBase.cs" /> |
19 | <include name="GridServer/GridCommsManagerLocal.cs" /> | 23 | <include name="GridServer/GridCommsManagerLocal.cs" /> |
20 | <include name="GridServer/GridCommsManagerOGS.cs" /> | 24 | <include name="Properties/AssemblyInfo.cs" /> |
25 | <include name="InterSimComms/InterSimsCommsOGS.cs" /> | ||
21 | <include name="InterSimComms/InterSimsCommsBase.cs" /> | 26 | <include name="InterSimComms/InterSimsCommsBase.cs" /> |
22 | <include name="InterSimComms/InterSimsCommsLocal.cs" /> | 27 | <include name="InterSimComms/InterSimsCommsLocal.cs" /> |
23 | <include name="InterSimComms/InterSimsCommsOGS.cs" /> | ||
24 | <include name="Properties/AssemblyInfo.cs" /> | ||
25 | <include name="UserServer/UserCommsManagerBase.cs" /> | ||
26 | <include name="UserServer/UserCommsManagerLocal.cs" /> | ||
27 | <include name="UserServer/UserCommsManagerOGS.cs" /> | ||
28 | </sources> | 28 | </sources> |
29 | <references basedir="${project::get-base-directory()}"> | 29 | <references basedir="${project::get-base-directory()}"> |
30 | <lib> | 30 | <lib> |
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj index 0da0982..9407a4f 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,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="System"> | 61 | <Reference Include="System" > |
69 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
70 | <Private>False</Private> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
72 | <Reference Include="System.Xml"> | 65 | <Reference Include="System.Xml" > |
73 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.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="Db4objects.Db4o.dll"> | 73 | <Reference Include="Db4objects.Db4o.dll" > |
81 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> | 74 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> |
82 | <Private>False</Private> | 75 | <Private>False</Private> |
83 | </Reference> | 76 | </Reference> |
@@ -87,13 +80,13 @@ | |||
87 | <Name>XMLRPC</Name> | 80 | <Name>XMLRPC</Name> |
88 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | 81 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> |
89 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 82 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
90 | <Private>False</Private> | 83 | <Private>False</Private> |
91 | </ProjectReference> | 84 | </ProjectReference> |
92 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 85 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> |
93 | <Name>OpenSim.Framework.Console</Name> | 86 | <Name>OpenSim.Framework.Console</Name> |
94 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 87 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> |
95 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 88 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
96 | <Private>False</Private> | 89 | <Private>False</Private> |
97 | </ProjectReference> | 90 | </ProjectReference> |
98 | </ItemGroup> | 91 | </ItemGroup> |
99 | <ItemGroup> | 92 | <ItemGroup> |
@@ -118,12 +111,6 @@ | |||
118 | <Compile Include="Remoting.cs"> | 111 | <Compile Include="Remoting.cs"> |
119 | <SubType>Code</SubType> | 112 | <SubType>Code</SubType> |
120 | </Compile> | 113 | </Compile> |
121 | <Compile Include="SimProfile.cs"> | ||
122 | <SubType>Code</SubType> | ||
123 | </Compile> | ||
124 | <Compile Include="SimProfileBase.cs"> | ||
125 | <SubType>Code</SubType> | ||
126 | </Compile> | ||
127 | <Compile Include="UserProfile.cs"> | 114 | <Compile Include="UserProfile.cs"> |
128 | <SubType>Code</SubType> | 115 | <SubType>Code</SubType> |
129 | </Compile> | 116 | </Compile> |
@@ -136,49 +123,55 @@ | |||
136 | <Compile Include="Util.cs"> | 123 | <Compile Include="Util.cs"> |
137 | <SubType>Code</SubType> | 124 | <SubType>Code</SubType> |
138 | </Compile> | 125 | </Compile> |
139 | <Compile Include="Interfaces\IAssetServer.cs"> | 126 | <Compile Include="SimProfile.cs"> |
140 | <SubType>Code</SubType> | 127 | <SubType>Code</SubType> |
141 | </Compile> | 128 | </Compile> |
142 | <Compile Include="Interfaces\IClientAPI.cs"> | 129 | <Compile Include="Interfaces\ILoginServer.cs"> |
143 | <SubType>Code</SubType> | 130 | <SubType>Code</SubType> |
144 | </Compile> | 131 | </Compile> |
145 | <Compile Include="Interfaces\IGridServer.cs"> | 132 | <Compile Include="Interfaces\IUserManager.cs"> |
146 | <SubType>Code</SubType> | 133 | <SubType>Code</SubType> |
147 | </Compile> | 134 | </Compile> |
148 | <Compile Include="Interfaces\ILocalStorage.cs"> | 135 | <Compile Include="Interfaces\LocalGridBase.cs"> |
136 | <SubType>Code</SubType> | ||
137 | </Compile> | ||
138 | <Compile Include="Interfaces\RemoteGridBase.cs"> | ||
149 | <SubType>Code</SubType> | 139 | <SubType>Code</SubType> |
150 | </Compile> | 140 | </Compile> |
151 | <Compile Include="Interfaces\IUserServer.cs"> | 141 | <Compile Include="Interfaces\IUserServer.cs"> |
152 | <SubType>Code</SubType> | 142 | <SubType>Code</SubType> |
153 | </Compile> | 143 | </Compile> |
144 | <Compile Include="Interfaces\IAssetServer.cs"> | ||
145 | <SubType>Code</SubType> | ||
146 | </Compile> | ||
154 | <Compile Include="Interfaces\IWorld.cs"> | 147 | <Compile Include="Interfaces\IWorld.cs"> |
155 | <SubType>Code</SubType> | 148 | <SubType>Code</SubType> |
156 | </Compile> | 149 | </Compile> |
157 | <Compile Include="Interfaces\LocalGridBase.cs"> | 150 | <Compile Include="Interfaces\IClientAPI.cs"> |
158 | <SubType>Code</SubType> | 151 | <SubType>Code</SubType> |
159 | </Compile> | 152 | </Compile> |
160 | <Compile Include="Interfaces\RemoteGridBase.cs"> | 153 | <Compile Include="Interfaces\IGridServer.cs"> |
161 | <SubType>Code</SubType> | 154 | <SubType>Code</SubType> |
162 | </Compile> | 155 | </Compile> |
163 | <Compile Include="Interfaces\Config\IGenericConfig.cs"> | 156 | <Compile Include="Interfaces\ILocalStorage.cs"> |
164 | <SubType>Code</SubType> | 157 | <SubType>Code</SubType> |
165 | </Compile> | 158 | </Compile> |
166 | <Compile Include="Interfaces\Config\IGridConfig.cs"> | 159 | <Compile Include="Interfaces\Scripting\IScriptEngine.cs"> |
167 | <SubType>Code</SubType> | 160 | <SubType>Code</SubType> |
168 | </Compile> | 161 | </Compile> |
169 | <Compile Include="Interfaces\Config\IUserConfig.cs"> | 162 | <Compile Include="Interfaces\Scripting\IScriptAPI.cs"> |
170 | <SubType>Code</SubType> | 163 | <SubType>Code</SubType> |
171 | </Compile> | 164 | </Compile> |
172 | <Compile Include="Interfaces\Remoting\IGridServerHost.cs"> | 165 | <Compile Include="Interfaces\Remoting\IProxyServerHost.cs"> |
173 | <SubType>Code</SubType> | 166 | <SubType>Code</SubType> |
174 | </Compile> | 167 | </Compile> |
175 | <Compile Include="Interfaces\Remoting\IProxyServerClient.cs"> | 168 | <Compile Include="Interfaces\Remoting\IProxyServerClient.cs"> |
176 | <SubType>Code</SubType> | 169 | <SubType>Code</SubType> |
177 | </Compile> | 170 | </Compile> |
178 | <Compile Include="Interfaces\Remoting\IProxyServerHost.cs"> | 171 | <Compile Include="Interfaces\Remoting\IRegionGridClient.cs"> |
179 | <SubType>Code</SubType> | 172 | <SubType>Code</SubType> |
180 | </Compile> | 173 | </Compile> |
181 | <Compile Include="Interfaces\Remoting\IRegionGridClient.cs"> | 174 | <Compile Include="Interfaces\Remoting\IGridServerHost.cs"> |
182 | <SubType>Code</SubType> | 175 | <SubType>Code</SubType> |
183 | </Compile> | 176 | </Compile> |
184 | <Compile Include="Interfaces\Remoting\IRegionSimHost.cs"> | 177 | <Compile Include="Interfaces\Remoting\IRegionSimHost.cs"> |
@@ -187,15 +180,24 @@ | |||
187 | <Compile Include="Interfaces\Remoting\RegionGridClientBase.cs"> | 180 | <Compile Include="Interfaces\Remoting\RegionGridClientBase.cs"> |
188 | <SubType>Code</SubType> | 181 | <SubType>Code</SubType> |
189 | </Compile> | 182 | </Compile> |
190 | <Compile Include="Interfaces\Scripting\IScriptAPI.cs"> | 183 | <Compile Include="Interfaces\Config\IGenericConfig.cs"> |
191 | <SubType>Code</SubType> | 184 | <SubType>Code</SubType> |
192 | </Compile> | 185 | </Compile> |
193 | <Compile Include="Interfaces\Scripting\IScriptEngine.cs"> | 186 | <Compile Include="Interfaces\Config\IUserConfig.cs"> |
187 | <SubType>Code</SubType> | ||
188 | </Compile> | ||
189 | <Compile Include="Interfaces\Config\IGridConfig.cs"> | ||
194 | <SubType>Code</SubType> | 190 | <SubType>Code</SubType> |
195 | </Compile> | 191 | </Compile> |
196 | <Compile Include="Properties\AssemblyInfo.cs"> | 192 | <Compile Include="Properties\AssemblyInfo.cs"> |
197 | <SubType>Code</SubType> | 193 | <SubType>Code</SubType> |
198 | </Compile> | 194 | </Compile> |
195 | <Compile Include="Types\ParcelData.cs"> | ||
196 | <SubType>Code</SubType> | ||
197 | </Compile> | ||
198 | <Compile Include="Types\EstateSettings.cs"> | ||
199 | <SubType>Code</SubType> | ||
200 | </Compile> | ||
199 | <Compile Include="Types\AgentCiruitData.cs"> | 201 | <Compile Include="Types\AgentCiruitData.cs"> |
200 | <SubType>Code</SubType> | 202 | <SubType>Code</SubType> |
201 | </Compile> | 203 | </Compile> |
@@ -211,9 +213,6 @@ | |||
211 | <Compile Include="Types\AssetStorage.cs"> | 213 | <Compile Include="Types\AssetStorage.cs"> |
212 | <SubType>Code</SubType> | 214 | <SubType>Code</SubType> |
213 | </Compile> | 215 | </Compile> |
214 | <Compile Include="Types\EstateSettings.cs"> | ||
215 | <SubType>Code</SubType> | ||
216 | </Compile> | ||
217 | <Compile Include="Types\Login.cs"> | 216 | <Compile Include="Types\Login.cs"> |
218 | <SubType>Code</SubType> | 217 | <SubType>Code</SubType> |
219 | </Compile> | 218 | </Compile> |
@@ -223,9 +222,6 @@ | |||
223 | <Compile Include="Types\NetworkServersInfo.cs"> | 222 | <Compile Include="Types\NetworkServersInfo.cs"> |
224 | <SubType>Code</SubType> | 223 | <SubType>Code</SubType> |
225 | </Compile> | 224 | </Compile> |
226 | <Compile Include="Types\ParcelData.cs"> | ||
227 | <SubType>Code</SubType> | ||
228 | </Compile> | ||
229 | <Compile Include="Types\PrimData.cs"> | 225 | <Compile Include="Types\PrimData.cs"> |
230 | <SubType>Code</SubType> | 226 | <SubType>Code</SubType> |
231 | </Compile> | 227 | </Compile> |
@@ -240,4 +236,4 @@ | |||
240 | <PostBuildEvent> | 236 | <PostBuildEvent> |
241 | </PostBuildEvent> | 237 | </PostBuildEvent> |
242 | </PropertyGroup> | 238 | </PropertyGroup> |
243 | </Project> \ No newline at end of file | 239 | </Project> |
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build index 7ead9a8..dcbff12 100644 --- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build +++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build | |||
@@ -18,43 +18,43 @@ | |||
18 | <include name="LoginService.cs" /> | 18 | <include name="LoginService.cs" /> |
19 | <include name="RegionCommsHostBase.cs" /> | 19 | <include name="RegionCommsHostBase.cs" /> |
20 | <include name="Remoting.cs" /> | 20 | <include name="Remoting.cs" /> |
21 | <include name="SimProfile.cs" /> | ||
22 | <include name="SimProfileBase.cs" /> | ||
23 | <include name="UserProfile.cs" /> | 21 | <include name="UserProfile.cs" /> |
24 | <include name="UserProfileManager.cs" /> | 22 | <include name="UserProfileManager.cs" /> |
25 | <include name="UserProfileManagerBase.cs" /> | 23 | <include name="UserProfileManagerBase.cs" /> |
26 | <include name="Util.cs" /> | 24 | <include name="Util.cs" /> |
25 | <include name="SimProfile.cs" /> | ||
26 | <include name="Interfaces/ILoginServer.cs" /> | ||
27 | <include name="Interfaces/IUserManager.cs" /> | ||
28 | <include name="Interfaces/LocalGridBase.cs" /> | ||
29 | <include name="Interfaces/RemoteGridBase.cs" /> | ||
30 | <include name="Interfaces/IUserServer.cs" /> | ||
27 | <include name="Interfaces/IAssetServer.cs" /> | 31 | <include name="Interfaces/IAssetServer.cs" /> |
32 | <include name="Interfaces/IWorld.cs" /> | ||
28 | <include name="Interfaces/IClientAPI.cs" /> | 33 | <include name="Interfaces/IClientAPI.cs" /> |
29 | <include name="Interfaces/IGridServer.cs" /> | 34 | <include name="Interfaces/IGridServer.cs" /> |
30 | <include name="Interfaces/ILocalStorage.cs" /> | 35 | <include name="Interfaces/ILocalStorage.cs" /> |
31 | <include name="Interfaces/IUserServer.cs" /> | 36 | <include name="Interfaces/Scripting/IScriptEngine.cs" /> |
32 | <include name="Interfaces/IWorld.cs" /> | 37 | <include name="Interfaces/Scripting/IScriptAPI.cs" /> |
33 | <include name="Interfaces/LocalGridBase.cs" /> | ||
34 | <include name="Interfaces/RemoteGridBase.cs" /> | ||
35 | <include name="Interfaces/Config/IGenericConfig.cs" /> | ||
36 | <include name="Interfaces/Config/IGridConfig.cs" /> | ||
37 | <include name="Interfaces/Config/IUserConfig.cs" /> | ||
38 | <include name="Interfaces/Remoting/IGridServerHost.cs" /> | ||
39 | <include name="Interfaces/Remoting/IProxyServerClient.cs" /> | ||
40 | <include name="Interfaces/Remoting/IProxyServerHost.cs" /> | 38 | <include name="Interfaces/Remoting/IProxyServerHost.cs" /> |
39 | <include name="Interfaces/Remoting/IProxyServerClient.cs" /> | ||
41 | <include name="Interfaces/Remoting/IRegionGridClient.cs" /> | 40 | <include name="Interfaces/Remoting/IRegionGridClient.cs" /> |
41 | <include name="Interfaces/Remoting/IGridServerHost.cs" /> | ||
42 | <include name="Interfaces/Remoting/IRegionSimHost.cs" /> | 42 | <include name="Interfaces/Remoting/IRegionSimHost.cs" /> |
43 | <include name="Interfaces/Remoting/RegionGridClientBase.cs" /> | 43 | <include name="Interfaces/Remoting/RegionGridClientBase.cs" /> |
44 | <include name="Interfaces/Scripting/IScriptAPI.cs" /> | 44 | <include name="Interfaces/Config/IGenericConfig.cs" /> |
45 | <include name="Interfaces/Scripting/IScriptEngine.cs" /> | 45 | <include name="Interfaces/Config/IUserConfig.cs" /> |
46 | <include name="Interfaces/Config/IGridConfig.cs" /> | ||
46 | <include name="Properties/AssemblyInfo.cs" /> | 47 | <include name="Properties/AssemblyInfo.cs" /> |
48 | <include name="Types/ParcelData.cs" /> | ||
49 | <include name="Types/EstateSettings.cs" /> | ||
47 | <include name="Types/AgentCiruitData.cs" /> | 50 | <include name="Types/AgentCiruitData.cs" /> |
48 | <include name="Types/AgentWearable.cs" /> | 51 | <include name="Types/AgentWearable.cs" /> |
49 | <include name="Types/AssetBase.cs" /> | 52 | <include name="Types/AssetBase.cs" /> |
50 | <include name="Types/AssetLandmark.cs" /> | 53 | <include name="Types/AssetLandmark.cs" /> |
51 | <include name="Types/AssetStorage.cs" /> | 54 | <include name="Types/AssetStorage.cs" /> |
52 | <include name="Types/EstateSettings.cs" /> | ||
53 | <include name="Types/Login.cs" /> | 55 | <include name="Types/Login.cs" /> |
54 | <include name="Types/NeighbourInfo.cs" /> | 56 | <include name="Types/NeighbourInfo.cs" /> |
55 | <include name="Types/NetworkServersInfo.cs" /> | 57 | <include name="Types/NetworkServersInfo.cs" /> |
56 | <include name="Types/OSVector3.cs" /> | ||
57 | <include name="Types/ParcelData.cs" /> | ||
58 | <include name="Types/PrimData.cs" /> | 58 | <include name="Types/PrimData.cs" /> |
59 | <include name="Types/RegionInfo.cs" /> | 59 | <include name="Types/RegionInfo.cs" /> |
60 | </sources> | 60 | </sources> |
diff --git a/Common/OpenSim.Framework/SimProfile.cs b/Common/OpenSim.Framework/SimProfile.cs index 2e37e02..cfa5e50 100644 --- a/Common/OpenSim.Framework/SimProfile.cs +++ b/Common/OpenSim.Framework/SimProfile.cs | |||
@@ -35,8 +35,20 @@ using Nwc.XmlRpc; | |||
35 | 35 | ||
36 | namespace OpenSim.Framework.Sims | 36 | namespace OpenSim.Framework.Sims |
37 | { | 37 | { |
38 | public class SimProfile : SimProfileBase | 38 | public class SimProfile |
39 | { | 39 | { |
40 | public LLUUID UUID; | ||
41 | public ulong regionhandle; | ||
42 | public string regionname; | ||
43 | public string sim_ip; | ||
44 | public uint sim_port; | ||
45 | public string caps_url; | ||
46 | public uint RegionLocX; | ||
47 | public uint RegionLocY; | ||
48 | public string sendkey; | ||
49 | public string recvkey; | ||
50 | public bool online; | ||
51 | |||
40 | public SimProfile LoadFromGrid(ulong region_handle, string GridURL, string SendKey, string RecvKey) | 52 | public SimProfile LoadFromGrid(ulong region_handle, string GridURL, string SendKey, string RecvKey) |
41 | { | 53 | { |
42 | try | 54 | try |
diff --git a/Common/OpenSim.Framework/SimProfileBase.cs b/Common/OpenSim.Framework/SimProfileBase.cs deleted file mode 100644 index bab18be..0000000 --- a/Common/OpenSim.Framework/SimProfileBase.cs +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://www.openmetaverse.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using libsecondlife; | ||
32 | |||
33 | namespace OpenSim.Framework.Sims | ||
34 | { | ||
35 | [System.Obsolete("Depreciated, use SimProfileData instead")] | ||
36 | public class SimProfileBase | ||
37 | { | ||
38 | public LLUUID UUID; | ||
39 | public ulong regionhandle; | ||
40 | public string regionname; | ||
41 | public string sim_ip; | ||
42 | public uint sim_port; | ||
43 | public string caps_url; | ||
44 | public uint RegionLocX; | ||
45 | public uint RegionLocY; | ||
46 | public string sendkey; | ||
47 | public string recvkey; | ||
48 | public bool online; | ||
49 | |||
50 | public SimProfileBase() | ||
51 | { | ||
52 | } | ||
53 | } | ||
54 | } | ||
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj index 0c61f75..f0a6eee 100644 --- a/Common/OpenSim.Servers/OpenSim.Servers.csproj +++ b/Common/OpenSim.Servers/OpenSim.Servers.csproj | |||
@@ -92,6 +92,12 @@ | |||
92 | </ProjectReference> | 92 | </ProjectReference> |
93 | </ItemGroup> | 93 | </ItemGroup> |
94 | <ItemGroup> | 94 | <ItemGroup> |
95 | <Compile Include="LoginServer2.cs"> | ||
96 | <SubType>Code</SubType> | ||
97 | </Compile> | ||
98 | <Compile Include="LocalLoginServer.cs"> | ||
99 | <SubType>Code</SubType> | ||
100 | </Compile> | ||
95 | <Compile Include="BaseHttpServer.cs"> | 101 | <Compile Include="BaseHttpServer.cs"> |
96 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
97 | </Compile> | 103 | </Compile> |
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.dll.build b/Common/OpenSim.Servers/OpenSim.Servers.dll.build index ec868f1..059829f 100644 --- a/Common/OpenSim.Servers/OpenSim.Servers.dll.build +++ b/Common/OpenSim.Servers/OpenSim.Servers.dll.build | |||
@@ -11,6 +11,8 @@ | |||
11 | <resources prefix="OpenSim.Servers" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Servers" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="LoginServer2.cs" /> | ||
15 | <include name="LocalLoginServer.cs" /> | ||
14 | <include name="BaseHttpServer.cs" /> | 16 | <include name="BaseHttpServer.cs" /> |
15 | <include name="CheckSumServer.cs" /> | 17 | <include name="CheckSumServer.cs" /> |
16 | <include name="IRestHandler.cs" /> | 18 | <include name="IRestHandler.cs" /> |
diff --git a/Common/XmlRpcCS/XMLRPC.csproj b/Common/XmlRpcCS/XMLRPC.csproj index 61f8be0..86f6aaa 100644 --- a/Common/XmlRpcCS/XMLRPC.csproj +++ b/Common/XmlRpcCS/XMLRPC.csproj | |||
@@ -70,58 +70,58 @@ | |||
70 | <ItemGroup> | 70 | <ItemGroup> |
71 | </ItemGroup> | 71 | </ItemGroup> |
72 | <ItemGroup> | 72 | <ItemGroup> |
73 | <Compile Include="Logger.cs"> | 73 | <Compile Include="XmlRpcBoxcarRequest.cs"> |
74 | <SubType>Code</SubType> | 74 | <SubType>Code</SubType> |
75 | </Compile> | 75 | </Compile> |
76 | <Compile Include="SimpleHttpRequest.cs"> | 76 | <Compile Include="XmlRpcRequest.cs"> |
77 | <SubType>Code</SubType> | 77 | <SubType>Code</SubType> |
78 | </Compile> | 78 | </Compile> |
79 | <Compile Include="XmlRpcBoxcarRequest.cs"> | 79 | <Compile Include="XmlRpcResponseSerializer.cs"> |
80 | <SubType>Code</SubType> | 80 | <SubType>Code</SubType> |
81 | </Compile> | 81 | </Compile> |
82 | <Compile Include="XmlRpcClientProxy.cs"> | 82 | <Compile Include="Logger.cs"> |
83 | <SubType>Code</SubType> | 83 | <SubType>Code</SubType> |
84 | </Compile> | 84 | </Compile> |
85 | <Compile Include="XmlRpcDeserializer.cs"> | 85 | <Compile Include="XmlRpcRequestDeserializer.cs"> |
86 | <SubType>Code</SubType> | 86 | <SubType>Code</SubType> |
87 | </Compile> | 87 | </Compile> |
88 | <Compile Include="XmlRpcErrorCodes.cs"> | 88 | <Compile Include="XmlRpcExposedAttribute.cs"> |
89 | <SubType>Code</SubType> | 89 | <SubType>Code</SubType> |
90 | </Compile> | 90 | </Compile> |
91 | <Compile Include="XmlRpcException.cs"> | 91 | <Compile Include="XmlRpcResponse.cs"> |
92 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
93 | </Compile> | 93 | </Compile> |
94 | <Compile Include="XmlRpcExposedAttribute.cs"> | 94 | <Compile Include="XmlRpcException.cs"> |
95 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
96 | </Compile> | 96 | </Compile> |
97 | <Compile Include="XmlRpcRequest.cs"> | 97 | <Compile Include="XmlRpcResponseDeserializer.cs"> |
98 | <SubType>Code</SubType> | 98 | <SubType>Code</SubType> |
99 | </Compile> | 99 | </Compile> |
100 | <Compile Include="XmlRpcRequestDeserializer.cs"> | 100 | <Compile Include="XmlRpcResponder.cs"> |
101 | <SubType>Code</SubType> | 101 | <SubType>Code</SubType> |
102 | </Compile> | 102 | </Compile> |
103 | <Compile Include="XmlRpcRequestSerializer.cs"> | 103 | <Compile Include="XmlRpcServer.cs"> |
104 | <SubType>Code</SubType> | 104 | <SubType>Code</SubType> |
105 | </Compile> | 105 | </Compile> |
106 | <Compile Include="XmlRpcResponder.cs"> | 106 | <Compile Include="XmlRpcErrorCodes.cs"> |
107 | <SubType>Code</SubType> | 107 | <SubType>Code</SubType> |
108 | </Compile> | 108 | </Compile> |
109 | <Compile Include="XmlRpcResponse.cs"> | 109 | <Compile Include="XmlRpcSerializer.cs"> |
110 | <SubType>Code</SubType> | 110 | <SubType>Code</SubType> |
111 | </Compile> | 111 | </Compile> |
112 | <Compile Include="XmlRpcResponseDeserializer.cs"> | 112 | <Compile Include="XmlRpcSystemObject.cs"> |
113 | <SubType>Code</SubType> | 113 | <SubType>Code</SubType> |
114 | </Compile> | 114 | </Compile> |
115 | <Compile Include="XmlRpcResponseSerializer.cs"> | 115 | <Compile Include="SimpleHttpRequest.cs"> |
116 | <SubType>Code</SubType> | 116 | <SubType>Code</SubType> |
117 | </Compile> | 117 | </Compile> |
118 | <Compile Include="XmlRpcSerializer.cs"> | 118 | <Compile Include="XmlRpcClientProxy.cs"> |
119 | <SubType>Code</SubType> | 119 | <SubType>Code</SubType> |
120 | </Compile> | 120 | </Compile> |
121 | <Compile Include="XmlRpcServer.cs"> | 121 | <Compile Include="XmlRpcRequestSerializer.cs"> |
122 | <SubType>Code</SubType> | 122 | <SubType>Code</SubType> |
123 | </Compile> | 123 | </Compile> |
124 | <Compile Include="XmlRpcSystemObject.cs"> | 124 | <Compile Include="XmlRpcDeserializer.cs"> |
125 | <SubType>Code</SubType> | 125 | <SubType>Code</SubType> |
126 | </Compile> | 126 | </Compile> |
127 | <Compile Include="XmlRpcXmlTokens.cs"> | 127 | <Compile Include="XmlRpcXmlTokens.cs"> |
diff --git a/Common/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build index 2eabfcd..8d5efd1 100644 --- a/Common/XmlRpcCS/XMLRPC.dll.build +++ b/Common/XmlRpcCS/XMLRPC.dll.build | |||
@@ -11,24 +11,24 @@ | |||
11 | <resources prefix="XMLRPC" dynamicprefix="true" > | 11 | <resources prefix="XMLRPC" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="Logger.cs" /> | ||
15 | <include name="SimpleHttpRequest.cs" /> | ||
16 | <include name="XmlRpcBoxcarRequest.cs" /> | 14 | <include name="XmlRpcBoxcarRequest.cs" /> |
17 | <include name="XmlRpcClientProxy.cs" /> | ||
18 | <include name="XmlRpcDeserializer.cs" /> | ||
19 | <include name="XmlRpcErrorCodes.cs" /> | ||
20 | <include name="XmlRpcException.cs" /> | ||
21 | <include name="XmlRpcExposedAttribute.cs" /> | ||
22 | <include name="XmlRpcRequest.cs" /> | 15 | <include name="XmlRpcRequest.cs" /> |
16 | <include name="XmlRpcResponseSerializer.cs" /> | ||
17 | <include name="Logger.cs" /> | ||
23 | <include name="XmlRpcRequestDeserializer.cs" /> | 18 | <include name="XmlRpcRequestDeserializer.cs" /> |
24 | <include name="XmlRpcRequestSerializer.cs" /> | 19 | <include name="XmlRpcExposedAttribute.cs" /> |
25 | <include name="XmlRpcResponder.cs" /> | ||
26 | <include name="XmlRpcResponse.cs" /> | 20 | <include name="XmlRpcResponse.cs" /> |
21 | <include name="XmlRpcException.cs" /> | ||
27 | <include name="XmlRpcResponseDeserializer.cs" /> | 22 | <include name="XmlRpcResponseDeserializer.cs" /> |
28 | <include name="XmlRpcResponseSerializer.cs" /> | 23 | <include name="XmlRpcResponder.cs" /> |
29 | <include name="XmlRpcSerializer.cs" /> | ||
30 | <include name="XmlRpcServer.cs" /> | 24 | <include name="XmlRpcServer.cs" /> |
25 | <include name="XmlRpcErrorCodes.cs" /> | ||
26 | <include name="XmlRpcSerializer.cs" /> | ||
31 | <include name="XmlRpcSystemObject.cs" /> | 27 | <include name="XmlRpcSystemObject.cs" /> |
28 | <include name="SimpleHttpRequest.cs" /> | ||
29 | <include name="XmlRpcClientProxy.cs" /> | ||
30 | <include name="XmlRpcRequestSerializer.cs" /> | ||
31 | <include name="XmlRpcDeserializer.cs" /> | ||
32 | <include name="XmlRpcXmlTokens.cs" /> | 32 | <include name="XmlRpcXmlTokens.cs" /> |
33 | </sources> | 33 | </sources> |
34 | <references basedir="${project::get-base-directory()}"> | 34 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenGridServices.sln b/OpenGridServices.sln index 9ed513f..86cb4ad 100644 --- a/OpenGridServices.sln +++ b/OpenGridServices.sln | |||
@@ -1,5 +1,5 @@ | |||
1 | Microsoft Visual Studio Solution File, Format Version 9.00 | 1 | Microsoft Visual Studio Solution File, Format Version 9.00 |
2 | # Visual C# Express 2005 | 2 | # Visual Studio 2005 |
3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}" | 3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenUser.Config.UserConfigDb4o", "OpenGridServices\OpenUser.Config\UserConfigDb4o\OpenUser.Config.UserConfigDb4o.csproj", "{7E494328-0000-0000-0000-000000000000}" |
4 | EndProject | 4 | EndProject |
5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.AssetServer", "OpenGridServices\OpenGridServices.AssetServer\OpenGridServices.AssetServer.csproj", "{0021261B-0000-0000-0000-000000000000}" | 5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.AssetServer", "OpenGridServices\OpenGridServices.AssetServer\OpenGridServices.AssetServer.csproj", "{0021261B-0000-0000-0000-000000000000}" |
@@ -23,57 +23,66 @@ EndProject | |||
23 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MySQL", "OpenGridServices\OpenGrid.Framework.Data.MySQL\OpenGrid.Framework.Data.MySQL.csproj", "{0F3C3AC1-0000-0000-0000-000000000000}" | 23 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Data.MySQL", "OpenGridServices\OpenGrid.Framework.Data.MySQL\OpenGrid.Framework.Data.MySQL.csproj", "{0F3C3AC1-0000-0000-0000-000000000000}" |
24 | EndProject | 24 | EndProject |
25 | Global | 25 | Global |
26 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 26 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
27 | Debug|Any CPU = Debug|Any CPU | 27 | Debug|Any CPU = Debug|Any CPU |
28 | Release|Any CPU = Release|Any CPU | 28 | Release|Any CPU = Release|Any CPU |
29 | EndGlobalSection | 29 | EndGlobalSection |
30 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | 30 | GlobalSection(ProjectDependencies) = postSolution |
31 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 31 | ({1E3F341A-0000-0000-0000-000000000000}).4 = ({62CDF671-0000-0000-0000-000000000000}) |
32 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 32 | ({39BD9497-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000}) |
33 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 33 | ({21BFC8E2-0000-0000-0000-000000000000}).6 = ({62CDF671-0000-0000-0000-000000000000}) |
34 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 34 | ({21BFC8E2-0000-0000-0000-000000000000}).7 = ({7924FD35-0000-0000-0000-000000000000}) |
35 | {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 35 | ({0A563AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000}) |
36 | {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 36 | ({66591469-0000-0000-0000-000000000000}).5 = ({62CDF671-0000-0000-0000-000000000000}) |
37 | {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 37 | ({0F3C3AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000}) |
38 | {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 38 | EndGlobalSection |
39 | {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 39 | GlobalSection(ProjectConfigurationPlatforms) = postSolution |
40 | {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 40 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
41 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 41 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
42 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 42 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
43 | {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 43 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
44 | {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 44 | {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
45 | {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 45 | {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
46 | {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 46 | {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
47 | {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 47 | {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
48 | {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 48 | {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
49 | {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 49 | {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
50 | {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 50 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
51 | {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 51 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
52 | {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 52 | {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
53 | {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 53 | {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
54 | {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 54 | {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
55 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 55 | {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
56 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 56 | {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
57 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 57 | {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
58 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 58 | {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
59 | {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 59 | {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
60 | {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 60 | {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
61 | {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 61 | {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
62 | {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 62 | {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
63 | {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 63 | {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
64 | {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 64 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
65 | {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 65 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
66 | {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 66 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
67 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 67 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
68 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 68 | {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
69 | {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 69 | {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
70 | {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 70 | {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
71 | {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 71 | {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
72 | {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 72 | {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
73 | {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 73 | {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
74 | {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 74 | {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
75 | EndGlobalSection | 75 | {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
76 | GlobalSection(SolutionProperties) = preSolution | 76 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
77 | HideSolutionNode = FALSE | 77 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
78 | EndGlobalSection | 78 | {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
79 | {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
80 | {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
81 | {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
82 | {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
83 | {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
84 | EndGlobalSection | ||
85 | GlobalSection(SolutionProperties) = preSolution | ||
86 | HideSolutionNode = FALSE | ||
87 | EndGlobalSection | ||
79 | EndGlobal | 88 | EndGlobal |
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj index 82d4f5f..3b783ca 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.csproj | |||
@@ -88,13 +88,13 @@ | |||
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | </ItemGroup> | 89 | </ItemGroup> |
90 | <ItemGroup> | 90 | <ItemGroup> |
91 | <Compile Include="DB4oGridData.cs"> | 91 | <Compile Include="DB4oUserData.cs"> |
92 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
93 | </Compile> | 93 | </Compile> |
94 | <Compile Include="DB4oManager.cs"> | 94 | <Compile Include="DB4oManager.cs"> |
95 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
96 | </Compile> | 96 | </Compile> |
97 | <Compile Include="DB4oUserData.cs"> | 97 | <Compile Include="DB4oGridData.cs"> |
98 | <SubType>Code</SubType> | 98 | <SubType>Code</SubType> |
99 | </Compile> | 99 | </Compile> |
100 | <Compile Include="Properties\AssemblyInfo.cs"> | 100 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build index 8e0f53a..db8662d 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build | |||
@@ -11,9 +11,9 @@ | |||
11 | <resources prefix="OpenGrid.Framework.Data.DB4o" dynamicprefix="true" > | 11 | <resources prefix="OpenGrid.Framework.Data.DB4o" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="DB4oGridData.cs" /> | ||
15 | <include name="DB4oManager.cs" /> | ||
16 | <include name="DB4oUserData.cs" /> | 14 | <include name="DB4oUserData.cs" /> |
15 | <include name="DB4oManager.cs" /> | ||
16 | <include name="DB4oGridData.cs" /> | ||
17 | <include name="Properties/AssemblyInfo.cs" /> | 17 | <include name="Properties/AssemblyInfo.cs" /> |
18 | </sources> | 18 | </sources> |
19 | <references basedir="${project::get-base-directory()}"> | 19 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj index 75ef149..5fe0cf7 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.csproj | |||
@@ -88,19 +88,19 @@ | |||
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | </ItemGroup> | 89 | </ItemGroup> |
90 | <ItemGroup> | 90 | <ItemGroup> |
91 | <Compile Include="MySQLGridData.cs"> | ||
92 | <SubType>Code</SubType> | ||
93 | </Compile> | ||
94 | <Compile Include="MySQLInventoryData.cs"> | 91 | <Compile Include="MySQLInventoryData.cs"> |
95 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
96 | </Compile> | 93 | </Compile> |
97 | <Compile Include="MySQLLogData.cs"> | 94 | <Compile Include="MySQLUserData.cs"> |
98 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
99 | </Compile> | 96 | </Compile> |
100 | <Compile Include="MySQLManager.cs"> | 97 | <Compile Include="MySQLManager.cs"> |
101 | <SubType>Code</SubType> | 98 | <SubType>Code</SubType> |
102 | </Compile> | 99 | </Compile> |
103 | <Compile Include="MySQLUserData.cs"> | 100 | <Compile Include="MySQLLogData.cs"> |
101 | <SubType>Code</SubType> | ||
102 | </Compile> | ||
103 | <Compile Include="MySQLGridData.cs"> | ||
104 | <SubType>Code</SubType> | 104 | <SubType>Code</SubType> |
105 | </Compile> | 105 | </Compile> |
106 | <Compile Include="Properties\AssemblyInfo.cs"> | 106 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build index 78f4afe..84d3d56 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build | |||
@@ -11,11 +11,11 @@ | |||
11 | <resources prefix="OpenGrid.Framework.Data.MySQL" dynamicprefix="true" > | 11 | <resources prefix="OpenGrid.Framework.Data.MySQL" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="MySQLGridData.cs" /> | ||
15 | <include name="MySQLInventoryData.cs" /> | 14 | <include name="MySQLInventoryData.cs" /> |
16 | <include name="MySQLLogData.cs" /> | ||
17 | <include name="MySQLManager.cs" /> | ||
18 | <include name="MySQLUserData.cs" /> | 15 | <include name="MySQLUserData.cs" /> |
16 | <include name="MySQLManager.cs" /> | ||
17 | <include name="MySQLLogData.cs" /> | ||
18 | <include name="MySQLGridData.cs" /> | ||
19 | <include name="Properties/AssemblyInfo.cs" /> | 19 | <include name="Properties/AssemblyInfo.cs" /> |
20 | </sources> | 20 | </sources> |
21 | <references basedir="${project::get-base-directory()}"> | 21 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj index 463cf86..fa17367 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.csproj | |||
@@ -88,10 +88,10 @@ | |||
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | </ItemGroup> | 89 | </ItemGroup> |
90 | <ItemGroup> | 90 | <ItemGroup> |
91 | <Compile Include="SQLiteGridData.cs"> | 91 | <Compile Include="SQLiteManager.cs"> |
92 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
93 | </Compile> | 93 | </Compile> |
94 | <Compile Include="SQLiteManager.cs"> | 94 | <Compile Include="SQLiteGridData.cs"> |
95 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
96 | </Compile> | 96 | </Compile> |
97 | <Compile Include="Properties\AssemblyInfo.cs"> | 97 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build index 1be9b43..8c0f8fe 100644 --- a/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build | |||
@@ -11,8 +11,8 @@ | |||
11 | <resources prefix="OpenGrid.Framework.Data.SQLite" dynamicprefix="true" > | 11 | <resources prefix="OpenGrid.Framework.Data.SQLite" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="SQLiteGridData.cs" /> | ||
15 | <include name="SQLiteManager.cs" /> | 14 | <include name="SQLiteManager.cs" /> |
15 | <include name="SQLiteGridData.cs" /> | ||
16 | <include name="Properties/AssemblyInfo.cs" /> | 16 | <include name="Properties/AssemblyInfo.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj index a572204..990cd16 100644 --- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj +++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.csproj | |||
@@ -81,6 +81,9 @@ | |||
81 | <Compile Include="GridData.cs"> | 81 | <Compile Include="GridData.cs"> |
82 | <SubType>Code</SubType> | 82 | <SubType>Code</SubType> |
83 | </Compile> | 83 | </Compile> |
84 | <Compile Include="SimProfileData.cs"> | ||
85 | <SubType>Code</SubType> | ||
86 | </Compile> | ||
84 | <Compile Include="ILogData.cs"> | 87 | <Compile Include="ILogData.cs"> |
85 | <SubType>Code</SubType> | 88 | <SubType>Code</SubType> |
86 | </Compile> | 89 | </Compile> |
@@ -90,9 +93,6 @@ | |||
90 | <Compile Include="InventoryData.cs"> | 93 | <Compile Include="InventoryData.cs"> |
91 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
92 | </Compile> | 95 | </Compile> |
93 | <Compile Include="SimProfileData.cs"> | ||
94 | <SubType>Code</SubType> | ||
95 | </Compile> | ||
96 | <Compile Include="UserData.cs"> | 96 | <Compile Include="UserData.cs"> |
97 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
98 | </Compile> | 98 | </Compile> |
diff --git a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build index e6e0313..c993a8d 100644 --- a/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build +++ b/OpenGridServices/OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build | |||
@@ -12,10 +12,10 @@ | |||
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="GridData.cs" /> | 14 | <include name="GridData.cs" /> |
15 | <include name="SimProfileData.cs" /> | ||
15 | <include name="ILogData.cs" /> | 16 | <include name="ILogData.cs" /> |
16 | <include name="IniConfig.cs" /> | 17 | <include name="IniConfig.cs" /> |
17 | <include name="InventoryData.cs" /> | 18 | <include name="InventoryData.cs" /> |
18 | <include name="SimProfileData.cs" /> | ||
19 | <include name="UserData.cs" /> | 19 | <include name="UserData.cs" /> |
20 | <include name="UserProfileData.cs" /> | 20 | <include name="UserProfileData.cs" /> |
21 | <include name="Properties/AssemblyInfo.cs" /> | 21 | <include name="Properties/AssemblyInfo.cs" /> |
diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj index 1bd07fb..8c0f513 100644 --- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj +++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.csproj | |||
@@ -108,10 +108,10 @@ | |||
108 | </ProjectReference> | 108 | </ProjectReference> |
109 | </ItemGroup> | 109 | </ItemGroup> |
110 | <ItemGroup> | 110 | <ItemGroup> |
111 | <Compile Include="Main.cs"> | 111 | <Compile Include="UserManager.cs"> |
112 | <SubType>Code</SubType> | 112 | <SubType>Code</SubType> |
113 | </Compile> | 113 | </Compile> |
114 | <Compile Include="UserManager.cs"> | 114 | <Compile Include="Main.cs"> |
115 | <SubType>Code</SubType> | 115 | <SubType>Code</SubType> |
116 | </Compile> | 116 | </Compile> |
117 | <Compile Include="Properties\AssemblyInfo.cs"> | 117 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build index 5275ef4..1183d65 100644 --- a/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build +++ b/OpenGridServices/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build | |||
@@ -11,8 +11,8 @@ | |||
11 | <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" > | 11 | <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="Main.cs" /> | ||
15 | <include name="UserManager.cs" /> | 14 | <include name="UserManager.cs" /> |
15 | <include name="Main.cs" /> | ||
16 | <include name="Properties/AssemblyInfo.cs" /> | 16 | <include name="Properties/AssemblyInfo.cs" /> |
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj index 5c30810..365af66 100644 --- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj +++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj | |||
@@ -136,6 +136,9 @@ | |||
136 | <Compile Include="Estate\EstateManager.cs"> | 136 | <Compile Include="Estate\EstateManager.cs"> |
137 | <SubType>Code</SubType> | 137 | <SubType>Code</SubType> |
138 | </Compile> | 138 | </Compile> |
139 | <Compile Include="World\AvatarAnimations.cs"> | ||
140 | <SubType>Code</SubType> | ||
141 | </Compile> | ||
139 | <Compile Include="World\Avatar.Client.cs"> | 142 | <Compile Include="World\Avatar.Client.cs"> |
140 | <SubType>Code</SubType> | 143 | <SubType>Code</SubType> |
141 | </Compile> | 144 | </Compile> |
@@ -145,9 +148,6 @@ | |||
145 | <Compile Include="World\Avatar.Update.cs"> | 148 | <Compile Include="World\Avatar.Update.cs"> |
146 | <SubType>Code</SubType> | 149 | <SubType>Code</SubType> |
147 | </Compile> | 150 | </Compile> |
148 | <Compile Include="World\AvatarAnimations.cs"> | ||
149 | <SubType>Code</SubType> | ||
150 | </Compile> | ||
151 | <Compile Include="World\Entity.cs"> | 151 | <Compile Include="World\Entity.cs"> |
152 | <SubType>Code</SubType> | 152 | <SubType>Code</SubType> |
153 | </Compile> | 153 | </Compile> |
@@ -163,10 +163,10 @@ | |||
163 | <Compile Include="World\World.PacketHandlers.cs"> | 163 | <Compile Include="World\World.PacketHandlers.cs"> |
164 | <SubType>Code</SubType> | 164 | <SubType>Code</SubType> |
165 | </Compile> | 165 | </Compile> |
166 | <Compile Include="World\World.Scripting.cs"> | 166 | <Compile Include="World\WorldBase.cs"> |
167 | <SubType>Code</SubType> | 167 | <SubType>Code</SubType> |
168 | </Compile> | 168 | </Compile> |
169 | <Compile Include="World\WorldBase.cs"> | 169 | <Compile Include="World\World.Scripting.cs"> |
170 | <SubType>Code</SubType> | 170 | <SubType>Code</SubType> |
171 | </Compile> | 171 | </Compile> |
172 | <Compile Include="World\scripting\IScriptContext.cs"> | 172 | <Compile Include="World\scripting\IScriptContext.cs"> |
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build index ae46c6b..a33d214 100644 --- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build +++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build | |||
@@ -13,17 +13,17 @@ | |||
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="ParcelManager.cs" /> | 14 | <include name="ParcelManager.cs" /> |
15 | <include name="Estate/EstateManager.cs" /> | 15 | <include name="Estate/EstateManager.cs" /> |
16 | <include name="World/AvatarAnimations.cs" /> | ||
16 | <include name="World/Avatar.Client.cs" /> | 17 | <include name="World/Avatar.Client.cs" /> |
17 | <include name="World/Avatar.cs" /> | 18 | <include name="World/Avatar.cs" /> |
18 | <include name="World/Avatar.Update.cs" /> | 19 | <include name="World/Avatar.Update.cs" /> |
19 | <include name="World/AvatarAnimations.cs" /> | ||
20 | <include name="World/Entity.cs" /> | 20 | <include name="World/Entity.cs" /> |
21 | <include name="World/Primitive.cs" /> | 21 | <include name="World/Primitive.cs" /> |
22 | <include name="World/SceneObject.cs" /> | 22 | <include name="World/SceneObject.cs" /> |
23 | <include name="World/World.cs" /> | 23 | <include name="World/World.cs" /> |
24 | <include name="World/World.PacketHandlers.cs" /> | 24 | <include name="World/World.PacketHandlers.cs" /> |
25 | <include name="World/World.Scripting.cs" /> | ||
26 | <include name="World/WorldBase.cs" /> | 25 | <include name="World/WorldBase.cs" /> |
26 | <include name="World/World.Scripting.cs" /> | ||
27 | <include name="World/scripting/IScriptContext.cs" /> | 27 | <include name="World/scripting/IScriptContext.cs" /> |
28 | <include name="World/scripting/IScriptEntity.cs" /> | 28 | <include name="World/scripting/IScriptEntity.cs" /> |
29 | <include name="World/scripting/IScriptHandler.cs" /> | 29 | <include name="World/scripting/IScriptHandler.cs" /> |
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 75b70b4..259d839 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.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>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{632E1BFD-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.RegionServer</AssemblyName> | 12 | <AssemblyName>OpenSim.RegionServer</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.RegionServer</RootNamespace> | 19 | <RootNamespace>OpenSim.RegionServer</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,27 +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="System"> | 61 | <Reference Include="System" > |
69 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
70 | <Private>False</Private> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
72 | <Reference Include="System.Xml"> | 65 | <Reference Include="System.Xml" > |
73 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.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="Axiom.MathLib.dll"> | 73 | <Reference Include="Axiom.MathLib.dll" > |
81 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> | 74 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> |
82 | <Private>False</Private> | 75 | <Private>False</Private> |
83 | </Reference> | 76 | </Reference> |
84 | <Reference Include="Db4objects.Db4o.dll"> | 77 | <Reference Include="Db4objects.Db4o.dll" > |
85 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> | 78 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> |
86 | <Private>False</Private> | 79 | <Private>False</Private> |
87 | </Reference> | 80 | </Reference> |
@@ -91,43 +84,43 @@ | |||
91 | <Name>OpenSim.Terrain.BasicTerrain</Name> | 84 | <Name>OpenSim.Terrain.BasicTerrain</Name> |
92 | <Project>{2270B8FE-0000-0000-0000-000000000000}</Project> | 85 | <Project>{2270B8FE-0000-0000-0000-000000000000}</Project> |
93 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
94 | <Private>False</Private> | 87 | <Private>False</Private> |
95 | </ProjectReference> | 88 | </ProjectReference> |
96 | <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> | 89 | <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> |
97 | <Name>OpenSim.Framework</Name> | 90 | <Name>OpenSim.Framework</Name> |
98 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 91 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
99 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
100 | <Private>False</Private> | 93 | <Private>False</Private> |
101 | </ProjectReference> | 94 | </ProjectReference> |
102 | <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 95 | <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> |
103 | <Name>OpenSim.Framework.Console</Name> | 96 | <Name>OpenSim.Framework.Console</Name> |
104 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 97 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> |
105 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
106 | <Private>False</Private> | 99 | <Private>False</Private> |
107 | </ProjectReference> | 100 | </ProjectReference> |
108 | <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj"> | 101 | <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj"> |
109 | <Name>OpenSim.GenericConfig.Xml</Name> | 102 | <Name>OpenSim.GenericConfig.Xml</Name> |
110 | <Project>{E88EF749-0000-0000-0000-000000000000}</Project> | 103 | <Project>{E88EF749-0000-0000-0000-000000000000}</Project> |
111 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
112 | <Private>False</Private> | 105 | <Private>False</Private> |
113 | </ProjectReference> | 106 | </ProjectReference> |
114 | <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> | 107 | <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> |
115 | <Name>OpenSim.Physics.Manager</Name> | 108 | <Name>OpenSim.Physics.Manager</Name> |
116 | <Project>{8BE16150-0000-0000-0000-000000000000}</Project> | 109 | <Project>{8BE16150-0000-0000-0000-000000000000}</Project> |
117 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 110 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
118 | <Private>False</Private> | 111 | <Private>False</Private> |
119 | </ProjectReference> | 112 | </ProjectReference> |
120 | <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> | 113 | <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> |
121 | <Name>OpenSim.Servers</Name> | 114 | <Name>OpenSim.Servers</Name> |
122 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> | 115 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> |
123 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 116 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
124 | <Private>False</Private> | 117 | <Private>False</Private> |
125 | </ProjectReference> | 118 | </ProjectReference> |
126 | <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj"> | 119 | <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj"> |
127 | <Name>XMLRPC</Name> | 120 | <Name>XMLRPC</Name> |
128 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | 121 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> |
129 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 122 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
130 | <Private>False</Private> | 123 | <Private>False</Private> |
131 | </ProjectReference> | 124 | </ProjectReference> |
132 | </ItemGroup> | 125 | </ItemGroup> |
133 | <ItemGroup> | 126 | <ItemGroup> |
@@ -161,16 +154,16 @@ | |||
161 | <Compile Include="PacketServer.cs"> | 154 | <Compile Include="PacketServer.cs"> |
162 | <SubType>Code</SubType> | 155 | <SubType>Code</SubType> |
163 | </Compile> | 156 | </Compile> |
164 | <Compile Include="RegionServerBase.cs"> | 157 | <Compile Include="UserConfigUtility.cs"> |
165 | <SubType>Code</SubType> | 158 | <SubType>Code</SubType> |
166 | </Compile> | 159 | </Compile> |
167 | <Compile Include="UDPServer.cs"> | 160 | <Compile Include="VersionInfo.cs"> |
168 | <SubType>Code</SubType> | 161 | <SubType>Code</SubType> |
169 | </Compile> | 162 | </Compile> |
170 | <Compile Include="UserConfigUtility.cs"> | 163 | <Compile Include="RegionServerBase.cs"> |
171 | <SubType>Code</SubType> | 164 | <SubType>Code</SubType> |
172 | </Compile> | 165 | </Compile> |
173 | <Compile Include="VersionInfo.cs"> | 166 | <Compile Include="UDPServer.cs"> |
174 | <SubType>Code</SubType> | 167 | <SubType>Code</SubType> |
175 | </Compile> | 168 | </Compile> |
176 | <Compile Include="Assets\AssetCache.cs"> | 169 | <Compile Include="Assets\AssetCache.cs"> |
@@ -187,4 +180,4 @@ | |||
187 | <PostBuildEvent> | 180 | <PostBuildEvent> |
188 | </PostBuildEvent> | 181 | </PostBuildEvent> |
189 | </PropertyGroup> | 182 | </PropertyGroup> |
190 | </Project> \ No newline at end of file | 183 | </Project> |
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build index 5b3e60b..32c1699 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build | |||
@@ -21,13 +21,12 @@ | |||
21 | <include name="NetworkServersInfo.cs" /> | 21 | <include name="NetworkServersInfo.cs" /> |
22 | <include name="OpenSimNetworkHandler.cs" /> | 22 | <include name="OpenSimNetworkHandler.cs" /> |
23 | <include name="PacketServer.cs" /> | 23 | <include name="PacketServer.cs" /> |
24 | <include name="RegionServerBase.cs" /> | ||
25 | <include name="UDPServer.cs" /> | ||
26 | <include name="UserConfigUtility.cs" /> | 24 | <include name="UserConfigUtility.cs" /> |
27 | <include name="VersionInfo.cs" /> | 25 | <include name="VersionInfo.cs" /> |
26 | <include name="RegionServerBase.cs" /> | ||
27 | <include name="UDPServer.cs" /> | ||
28 | <include name="Assets/AssetCache.cs" /> | 28 | <include name="Assets/AssetCache.cs" /> |
29 | <include name="Assets/InventoryCache.cs" /> | 29 | <include name="Assets/InventoryCache.cs" /> |
30 | <include name="CAPS/AdminWebFront.cs" /> | ||
31 | </sources> | 30 | </sources> |
32 | <references basedir="${project::get-base-directory()}"> | 31 | <references basedir="${project::get-base-directory()}"> |
33 | <lib> | 32 | <lib> |
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj index 0750742..6bcf38a 100644 --- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj +++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.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>{97A82740-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{97A82740-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.Scripting.EmbeddedJVM</AssemblyName> | 12 | <AssemblyName>OpenSim.Scripting.EmbeddedJVM</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.Scripting.EmbeddedJVM</RootNamespace> | 19 | <RootNamespace>OpenSim.Scripting.EmbeddedJVM</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,29 +55,28 @@ | |||
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, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL"> | 61 | <Reference Include="System" > |
69 | <SpecificVersion>False</SpecificVersion> | ||
70 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | ||
71 | </Reference> | ||
72 | <Reference Include="System"> | ||
73 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
74 | <Private>False</Private> | 63 | <Private>False</Private> |
75 | </Reference> | 64 | </Reference> |
76 | <Reference Include="System.Xml"> | 65 | <Reference Include="System.Xml" > |
77 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.dll</HintPath> |
78 | <Private>False</Private> | 67 | <Private>False</Private> |
79 | </Reference> | 68 | </Reference> |
69 | <Reference Include="libsecondlife.dll" > | ||
70 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | ||
71 | <Private>False</Private> | ||
72 | </Reference> | ||
80 | </ItemGroup> | 73 | </ItemGroup> |
81 | <ItemGroup> | 74 | <ItemGroup> |
82 | <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> | 75 | <ProjectReference Include="..\..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> |
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 | </ItemGroup> | 81 | </ItemGroup> |
89 | <ItemGroup> | 82 | <ItemGroup> |
@@ -102,9 +95,6 @@ | |||
102 | <Compile Include="InterpreterLogic.cs"> | 95 | <Compile Include="InterpreterLogic.cs"> |
103 | <SubType>Code</SubType> | 96 | <SubType>Code</SubType> |
104 | </Compile> | 97 | </Compile> |
105 | <Compile Include="InterpreterMethods.cs"> | ||
106 | <SubType>Code</SubType> | ||
107 | </Compile> | ||
108 | <Compile Include="InterpreterReturn.cs"> | 98 | <Compile Include="InterpreterReturn.cs"> |
109 | <SubType>Code</SubType> | 99 | <SubType>Code</SubType> |
110 | </Compile> | 100 | </Compile> |
@@ -129,6 +119,9 @@ | |||
129 | <Compile Include="Thread.cs"> | 119 | <Compile Include="Thread.cs"> |
130 | <SubType>Code</SubType> | 120 | <SubType>Code</SubType> |
131 | </Compile> | 121 | </Compile> |
122 | <Compile Include="InterpreterMethods.cs"> | ||
123 | <SubType>Code</SubType> | ||
124 | </Compile> | ||
132 | <Compile Include="Properties\AssemblyInfo.cs"> | 125 | <Compile Include="Properties\AssemblyInfo.cs"> |
133 | <SubType>Code</SubType> | 126 | <SubType>Code</SubType> |
134 | </Compile> | 127 | </Compile> |
@@ -161,4 +154,4 @@ | |||
161 | <PostBuildEvent> | 154 | <PostBuildEvent> |
162 | </PostBuildEvent> | 155 | </PostBuildEvent> |
163 | </PropertyGroup> | 156 | </PropertyGroup> |
164 | </Project> \ No newline at end of file | 157 | </Project> |
diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build index c5255db..2ff51ef 100644 --- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build +++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build | |||
@@ -16,7 +16,6 @@ | |||
16 | <include name="Heap.cs" /> | 16 | <include name="Heap.cs" /> |
17 | <include name="Interpreter.cs" /> | 17 | <include name="Interpreter.cs" /> |
18 | <include name="InterpreterLogic.cs" /> | 18 | <include name="InterpreterLogic.cs" /> |
19 | <include name="InterpreterMethods.cs" /> | ||
20 | <include name="InterpreterReturn.cs" /> | 19 | <include name="InterpreterReturn.cs" /> |
21 | <include name="MainMemory.cs" /> | 20 | <include name="MainMemory.cs" /> |
22 | <include name="MethodMemory.cs" /> | 21 | <include name="MethodMemory.cs" /> |
@@ -25,6 +24,7 @@ | |||
25 | <include name="Stack.cs" /> | 24 | <include name="Stack.cs" /> |
26 | <include name="StackFrame.cs" /> | 25 | <include name="StackFrame.cs" /> |
27 | <include name="Thread.cs" /> | 26 | <include name="Thread.cs" /> |
27 | <include name="InterpreterMethods.cs" /> | ||
28 | <include name="Properties/AssemblyInfo.cs" /> | 28 | <include name="Properties/AssemblyInfo.cs" /> |
29 | <include name="Types/ArrayReference.cs" /> | 29 | <include name="Types/ArrayReference.cs" /> |
30 | <include name="Types/BaseType.cs" /> | 30 | <include name="Types/BaseType.cs" /> |
@@ -41,6 +41,7 @@ | |||
41 | </lib> | 41 | </lib> |
42 | <include name="System.dll" /> | 42 | <include name="System.dll" /> |
43 | <include name="System.Xml.dll" /> | 43 | <include name="System.Xml.dll" /> |
44 | <include name="../../../bin/libsecondlife.dll" /> | ||
44 | <include name="../../../bin/OpenSim.Framework.dll" /> | 45 | <include name="../../../bin/OpenSim.Framework.dll" /> |
45 | </references> | 46 | </references> |
46 | </csc> | 47 | </csc> |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj index 15ae5bf..6f92e76 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj +++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj | |||
@@ -90,19 +90,19 @@ | |||
90 | </ProjectReference> | 90 | </ProjectReference> |
91 | </ItemGroup> | 91 | </ItemGroup> |
92 | <ItemGroup> | 92 | <ItemGroup> |
93 | <Compile Include="AssemblyInfo.cs"> | 93 | <Compile Include="UUIDParcelQuery.cs"> |
94 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
95 | </Compile> | 95 | </Compile> |
96 | <Compile Include="Db4LocalStorage.cs"> | 96 | <Compile Include="UUIDPrimQuery.cs"> |
97 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
98 | </Compile> | 98 | </Compile> |
99 | <Compile Include="MapStorage.cs"> | 99 | <Compile Include="Db4LocalStorage.cs"> |
100 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
101 | </Compile> | 101 | </Compile> |
102 | <Compile Include="UUIDParcelQuery.cs"> | 102 | <Compile Include="AssemblyInfo.cs"> |
103 | <SubType>Code</SubType> | 103 | <SubType>Code</SubType> |
104 | </Compile> | 104 | </Compile> |
105 | <Compile Include="UUIDPrimQuery.cs"> | 105 | <Compile Include="MapStorage.cs"> |
106 | <SubType>Code</SubType> | 106 | <SubType>Code</SubType> |
107 | </Compile> | 107 | </Compile> |
108 | </ItemGroup> | 108 | </ItemGroup> |
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build index c2fd2bd..7fb50c8 100644 --- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build | |||
@@ -11,11 +11,11 @@ | |||
11 | <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | ||
15 | <include name="Db4LocalStorage.cs" /> | ||
16 | <include name="MapStorage.cs" /> | ||
17 | <include name="UUIDParcelQuery.cs" /> | 14 | <include name="UUIDParcelQuery.cs" /> |
18 | <include name="UUIDPrimQuery.cs" /> | 15 | <include name="UUIDPrimQuery.cs" /> |
16 | <include name="Db4LocalStorage.cs" /> | ||
17 | <include name="AssemblyInfo.cs" /> | ||
18 | <include name="MapStorage.cs" /> | ||
19 | </sources> | 19 | </sources> |
20 | <references basedir="${project::get-base-directory()}"> | 20 | <references basedir="${project::get-base-directory()}"> |
21 | <lib> | 21 | <lib> |
diff --git a/Prebuild/src/Prebuild.csproj b/Prebuild/src/Prebuild.csproj index 55efffa..df6b4f4 100644 --- a/Prebuild/src/Prebuild.csproj +++ b/Prebuild/src/Prebuild.csproj | |||
@@ -83,9 +83,6 @@ | |||
83 | <Compile Include="Prebuild.cs"> | 83 | <Compile Include="Prebuild.cs"> |
84 | <SubType>Code</SubType> | 84 | <SubType>Code</SubType> |
85 | </Compile> | 85 | </Compile> |
86 | <Compile Include="Core\FatalException.cs"> | ||
87 | <SubType>Code</SubType> | ||
88 | </Compile> | ||
89 | <Compile Include="Core\Kernel.cs"> | 86 | <Compile Include="Core\Kernel.cs"> |
90 | <SubType>Code</SubType> | 87 | <SubType>Code</SubType> |
91 | </Compile> | 88 | </Compile> |
@@ -95,19 +92,25 @@ | |||
95 | <Compile Include="Core\WarningException.cs"> | 92 | <Compile Include="Core\WarningException.cs"> |
96 | <SubType>Code</SubType> | 93 | <SubType>Code</SubType> |
97 | </Compile> | 94 | </Compile> |
98 | <Compile Include="Core\Attributes\DataNodeAttribute.cs"> | 95 | <Compile Include="Core\FatalException.cs"> |
96 | <SubType>Code</SubType> | ||
97 | </Compile> | ||
98 | <Compile Include="Core\Interfaces\ITarget.cs"> | ||
99 | <SubType>Code</SubType> | ||
100 | </Compile> | ||
101 | <Compile Include="Core\Interfaces\IDataNode.cs"> | ||
99 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
100 | </Compile> | 103 | </Compile> |
101 | <Compile Include="Core\Attributes\OptionNodeAttribute.cs"> | 104 | <Compile Include="Core\Attributes\OptionNodeAttribute.cs"> |
102 | <SubType>Code</SubType> | 105 | <SubType>Code</SubType> |
103 | </Compile> | 106 | </Compile> |
104 | <Compile Include="Core\Attributes\TargetAttribute.cs"> | 107 | <Compile Include="Core\Attributes\DataNodeAttribute.cs"> |
105 | <SubType>Code</SubType> | 108 | <SubType>Code</SubType> |
106 | </Compile> | 109 | </Compile> |
107 | <Compile Include="Core\Interfaces\IDataNode.cs"> | 110 | <Compile Include="Core\Attributes\TargetAttribute.cs"> |
108 | <SubType>Code</SubType> | 111 | <SubType>Code</SubType> |
109 | </Compile> | 112 | </Compile> |
110 | <Compile Include="Core\Interfaces\ITarget.cs"> | 113 | <Compile Include="Core\Nodes\ProjectNode.cs"> |
111 | <SubType>Code</SubType> | 114 | <SubType>Code</SubType> |
112 | </Compile> | 115 | </Compile> |
113 | <Compile Include="Core\Nodes\ConfigurationNode.cs"> | 116 | <Compile Include="Core\Nodes\ConfigurationNode.cs"> |
@@ -119,76 +122,73 @@ | |||
119 | <Compile Include="Core\Nodes\ExcludeNode.cs"> | 122 | <Compile Include="Core\Nodes\ExcludeNode.cs"> |
120 | <SubType>Code</SubType> | 123 | <SubType>Code</SubType> |
121 | </Compile> | 124 | </Compile> |
122 | <Compile Include="Core\Nodes\FileNode.cs"> | 125 | <Compile Include="Core\Nodes\OptionsNode.cs"> |
123 | <SubType>Code</SubType> | 126 | <SubType>Code</SubType> |
124 | </Compile> | 127 | </Compile> |
125 | <Compile Include="Core\Nodes\FilesNode.cs"> | 128 | <Compile Include="Core\Nodes\ReferencePathNode.cs"> |
126 | <SubType>Code</SubType> | 129 | <SubType>Code</SubType> |
127 | </Compile> | 130 | </Compile> |
128 | <Compile Include="Core\Nodes\MatchNode.cs"> | 131 | <Compile Include="Core\Nodes\MatchNode.cs"> |
129 | <SubType>Code</SubType> | 132 | <SubType>Code</SubType> |
130 | </Compile> | 133 | </Compile> |
131 | <Compile Include="Core\Nodes\OptionsNode.cs"> | 134 | <Compile Include="Core\Nodes\SolutionNode.cs"> |
132 | <SubType>Code</SubType> | 135 | <SubType>Code</SubType> |
133 | </Compile> | 136 | </Compile> |
134 | <Compile Include="Core\Nodes\ProcessNode.cs"> | 137 | <Compile Include="Core\Nodes\ProcessNode.cs"> |
135 | <SubType>Code</SubType> | 138 | <SubType>Code</SubType> |
136 | </Compile> | 139 | </Compile> |
137 | <Compile Include="Core\Nodes\ProjectNode.cs"> | ||
138 | <SubType>Code</SubType> | ||
139 | </Compile> | ||
140 | <Compile Include="Core\Nodes\ReferenceNode.cs"> | 140 | <Compile Include="Core\Nodes\ReferenceNode.cs"> |
141 | <SubType>Code</SubType> | 141 | <SubType>Code</SubType> |
142 | </Compile> | 142 | </Compile> |
143 | <Compile Include="Core\Nodes\ReferencePathNode.cs"> | 143 | <Compile Include="Core\Nodes\FileNode.cs"> |
144 | <SubType>Code</SubType> | 144 | <SubType>Code</SubType> |
145 | </Compile> | 145 | </Compile> |
146 | <Compile Include="Core\Nodes\SolutionNode.cs"> | 146 | <Compile Include="Core\Nodes\FilesNode.cs"> |
147 | <SubType>Code</SubType> | 147 | <SubType>Code</SubType> |
148 | </Compile> | 148 | </Compile> |
149 | <Compile Include="Core\Parse\IfContext.cs"> | 149 | <Compile Include="Core\Targets\DebugTarget.cs"> |
150 | <SubType>Code</SubType> | 150 | <SubType>Code</SubType> |
151 | </Compile> | 151 | </Compile> |
152 | <Compile Include="Core\Parse\Preprocessor.cs"> | 152 | <Compile Include="Core\Targets\MonoDevelopTarget.cs"> |
153 | <SubType>Code</SubType> | 153 | <SubType>Code</SubType> |
154 | </Compile> | 154 | </Compile> |
155 | <Compile Include="Core\Targets\AutotoolsTarget.cs"> | 155 | <Compile Include="Core\Targets\AutotoolsTarget.cs"> |
156 | <SubType>Code</SubType> | 156 | <SubType>Code</SubType> |
157 | </Compile> | 157 | </Compile> |
158 | <Compile Include="Core\Targets\DebugTarget.cs"> | 158 | <Compile Include="Core\Targets\SharpDevelopTarget.cs"> |
159 | <SubType>Code</SubType> | 159 | <SubType>Code</SubType> |
160 | </Compile> | 160 | </Compile> |
161 | <Compile Include="Core\Targets\MonoDevelopTarget.cs"> | 161 | <Compile Include="Core\Targets\VS2002Target.cs"> |
162 | <SubType>Code</SubType> | 162 | <SubType>Code</SubType> |
163 | </Compile> | 163 | </Compile> |
164 | <Compile Include="Core\Targets\NAntTarget.cs"> | 164 | <Compile Include="Core\Targets\VS2003Target.cs"> |
165 | <SubType>Code</SubType> | 165 | <SubType>Code</SubType> |
166 | </Compile> | 166 | </Compile> |
167 | <Compile Include="Core\Targets\SharpDevelop2Target.cs"> | 167 | <Compile Include="Core\Targets\SharpDevelop2Target.cs"> |
168 | <SubType>Code</SubType> | 168 | <SubType>Code</SubType> |
169 | </Compile> | 169 | </Compile> |
170 | <Compile Include="Core\Targets\SharpDevelopTarget.cs"> | 170 | <Compile Include="Core\Targets\VS2005Target.cs"> |
171 | <SubType>Code</SubType> | 171 | <SubType>Code</SubType> |
172 | </Compile> | 172 | </Compile> |
173 | <Compile Include="Core\Targets\VS2002Target.cs"> | 173 | <Compile Include="Core\Targets\NAntTarget.cs"> |
174 | <SubType>Code</SubType> | 174 | <SubType>Code</SubType> |
175 | </Compile> | 175 | </Compile> |
176 | <Compile Include="Core\Targets\VS2003Target.cs"> | 176 | <Compile Include="Core\Parse\IfContext.cs"> |
177 | <SubType>Code</SubType> | 177 | <SubType>Code</SubType> |
178 | </Compile> | 178 | </Compile> |
179 | <Compile Include="Core\Targets\VS2005Target.cs"> | 179 | <Compile Include="Core\Parse\Preprocessor.cs"> |
180 | <SubType>Code</SubType> | 180 | <SubType>Code</SubType> |
181 | </Compile> | 181 | </Compile> |
182 | <Compile Include="Core\Utilities\CommandLineCollection.cs"> | 182 | <Compile Include="Core\Utilities\Helper.cs"> |
183 | <SubType>Code</SubType> | 183 | <SubType>Code</SubType> |
184 | </Compile> | 184 | </Compile> |
185 | <Compile Include="Core\Utilities\CurrentDirectory.cs"> | 185 | <Compile Include="Core\Utilities\Log.cs"> |
186 | <SubType>Code</SubType> | 186 | <SubType>Code</SubType> |
187 | </Compile> | 187 | </Compile> |
188 | <Compile Include="Core\Utilities\Helper.cs"> | 188 | <Compile Include="Core\Utilities\CommandLineCollection.cs"> |
189 | <SubType>Code</SubType> | 189 | <SubType>Code</SubType> |
190 | </Compile> | 190 | </Compile> |
191 | <Compile Include="Core\Utilities\Log.cs"> | 191 | <Compile Include="Core\Utilities\CurrentDirectory.cs"> |
192 | <SubType>Code</SubType> | 192 | <SubType>Code</SubType> |
193 | </Compile> | 193 | </Compile> |
194 | <Compile Include="Properties\AssemblyInfo.cs"> | 194 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build index 43f5516..f2c8cab 100644 --- a/Prebuild/src/Prebuild.exe.build +++ b/Prebuild/src/Prebuild.exe.build | |||
@@ -14,42 +14,42 @@ | |||
14 | </resources> | 14 | </resources> |
15 | <sources failonempty="true"> | 15 | <sources failonempty="true"> |
16 | <include name="Prebuild.cs" /> | 16 | <include name="Prebuild.cs" /> |
17 | <include name="Core/FatalException.cs" /> | ||
18 | <include name="Core/Kernel.cs" /> | 17 | <include name="Core/Kernel.cs" /> |
19 | <include name="Core/UnknownLanguageException.cs" /> | 18 | <include name="Core/UnknownLanguageException.cs" /> |
20 | <include name="Core/WarningException.cs" /> | 19 | <include name="Core/WarningException.cs" /> |
21 | <include name="Core/Attributes/DataNodeAttribute.cs" /> | 20 | <include name="Core/FatalException.cs" /> |
21 | <include name="Core/Interfaces/ITarget.cs" /> | ||
22 | <include name="Core/Interfaces/IDataNode.cs" /> | ||
22 | <include name="Core/Attributes/OptionNodeAttribute.cs" /> | 23 | <include name="Core/Attributes/OptionNodeAttribute.cs" /> |
24 | <include name="Core/Attributes/DataNodeAttribute.cs" /> | ||
23 | <include name="Core/Attributes/TargetAttribute.cs" /> | 25 | <include name="Core/Attributes/TargetAttribute.cs" /> |
24 | <include name="Core/Interfaces/IDataNode.cs" /> | 26 | <include name="Core/Nodes/ProjectNode.cs" /> |
25 | <include name="Core/Interfaces/ITarget.cs" /> | ||
26 | <include name="Core/Nodes/ConfigurationNode.cs" /> | 27 | <include name="Core/Nodes/ConfigurationNode.cs" /> |
27 | <include name="Core/Nodes/DataNode.cs" /> | 28 | <include name="Core/Nodes/DataNode.cs" /> |
28 | <include name="Core/Nodes/ExcludeNode.cs" /> | 29 | <include name="Core/Nodes/ExcludeNode.cs" /> |
29 | <include name="Core/Nodes/FileNode.cs" /> | ||
30 | <include name="Core/Nodes/FilesNode.cs" /> | ||
31 | <include name="Core/Nodes/MatchNode.cs" /> | ||
32 | <include name="Core/Nodes/OptionsNode.cs" /> | 30 | <include name="Core/Nodes/OptionsNode.cs" /> |
33 | <include name="Core/Nodes/ProcessNode.cs" /> | ||
34 | <include name="Core/Nodes/ProjectNode.cs" /> | ||
35 | <include name="Core/Nodes/ReferenceNode.cs" /> | ||
36 | <include name="Core/Nodes/ReferencePathNode.cs" /> | 31 | <include name="Core/Nodes/ReferencePathNode.cs" /> |
32 | <include name="Core/Nodes/MatchNode.cs" /> | ||
37 | <include name="Core/Nodes/SolutionNode.cs" /> | 33 | <include name="Core/Nodes/SolutionNode.cs" /> |
38 | <include name="Core/Parse/IfContext.cs" /> | 34 | <include name="Core/Nodes/ProcessNode.cs" /> |
39 | <include name="Core/Parse/Preprocessor.cs" /> | 35 | <include name="Core/Nodes/ReferenceNode.cs" /> |
40 | <include name="Core/Targets/AutotoolsTarget.cs" /> | 36 | <include name="Core/Nodes/FileNode.cs" /> |
37 | <include name="Core/Nodes/FilesNode.cs" /> | ||
41 | <include name="Core/Targets/DebugTarget.cs" /> | 38 | <include name="Core/Targets/DebugTarget.cs" /> |
42 | <include name="Core/Targets/MonoDevelopTarget.cs" /> | 39 | <include name="Core/Targets/MonoDevelopTarget.cs" /> |
43 | <include name="Core/Targets/NAntTarget.cs" /> | 40 | <include name="Core/Targets/AutotoolsTarget.cs" /> |
44 | <include name="Core/Targets/SharpDevelop2Target.cs" /> | ||
45 | <include name="Core/Targets/SharpDevelopTarget.cs" /> | 41 | <include name="Core/Targets/SharpDevelopTarget.cs" /> |
46 | <include name="Core/Targets/VS2002Target.cs" /> | 42 | <include name="Core/Targets/VS2002Target.cs" /> |
47 | <include name="Core/Targets/VS2003Target.cs" /> | 43 | <include name="Core/Targets/VS2003Target.cs" /> |
44 | <include name="Core/Targets/SharpDevelop2Target.cs" /> | ||
48 | <include name="Core/Targets/VS2005Target.cs" /> | 45 | <include name="Core/Targets/VS2005Target.cs" /> |
49 | <include name="Core/Utilities/CommandLineCollection.cs" /> | 46 | <include name="Core/Targets/NAntTarget.cs" /> |
50 | <include name="Core/Utilities/CurrentDirectory.cs" /> | 47 | <include name="Core/Parse/IfContext.cs" /> |
48 | <include name="Core/Parse/Preprocessor.cs" /> | ||
51 | <include name="Core/Utilities/Helper.cs" /> | 49 | <include name="Core/Utilities/Helper.cs" /> |
52 | <include name="Core/Utilities/Log.cs" /> | 50 | <include name="Core/Utilities/Log.cs" /> |
51 | <include name="Core/Utilities/CommandLineCollection.cs" /> | ||
52 | <include name="Core/Utilities/CurrentDirectory.cs" /> | ||
53 | <include name="Properties/AssemblyInfo.cs" /> | 53 | <include name="Properties/AssemblyInfo.cs" /> |
54 | </sources> | 54 | </sources> |
55 | <references basedir="${project::get-base-directory()}"> | 55 | <references basedir="${project::get-base-directory()}"> |
diff --git a/prebuild.xml b/prebuild.xml index 2aa8a37..3aadd9b 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -406,6 +406,8 @@ | |||
406 | <ReferencePath>../../../bin/</ReferencePath> | 406 | <ReferencePath>../../../bin/</ReferencePath> |
407 | <Reference name="System"/> | 407 | <Reference name="System"/> |
408 | <Reference name="System.Xml"/> | 408 | <Reference name="System.Xml"/> |
409 | |||
410 | <Reference name="libsecondlife.dll"/> | ||
409 | <Reference name="OpenSim.Framework"/> | 411 | <Reference name="OpenSim.Framework"/> |
410 | 412 | ||
411 | <Files> | 413 | <Files> |