diff options
Diffstat (limited to 'OpenSim')
30 files changed, 159 insertions, 172 deletions
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj index 0ee62e9..31ab172 100644 --- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj +++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj | |||
@@ -86,16 +86,16 @@ | |||
86 | </ProjectReference> | 86 | </ProjectReference> |
87 | </ItemGroup> | 87 | </ItemGroup> |
88 | <ItemGroup> | 88 | <ItemGroup> |
89 | <Compile Include="IUserServices.cs"> | 89 | <Compile Include="CommunicationsManager.cs"> |
90 | <SubType>Code</SubType> | 90 | <SubType>Code</SubType> |
91 | </Compile> | 91 | </Compile> |
92 | <Compile Include="IGridServices.cs"> | 92 | <Compile Include="IGridServices.cs"> |
93 | <SubType>Code</SubType> | 93 | <SubType>Code</SubType> |
94 | </Compile> | 94 | </Compile> |
95 | <Compile Include="CommunicationsManager.cs"> | 95 | <Compile Include="IInterRegionCommunications.cs"> |
96 | <SubType>Code</SubType> | 96 | <SubType>Code</SubType> |
97 | </Compile> | 97 | </Compile> |
98 | <Compile Include="IInterRegionCommunications.cs"> | 98 | <Compile Include="IUserServices.cs"> |
99 | <SubType>Code</SubType> | 99 | <SubType>Code</SubType> |
100 | </Compile> | 100 | </Compile> |
101 | <Compile Include="Properties\AssemblyInfo.cs"> | 101 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build index 8b0e0f6..52d29f6 100644 --- a/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build +++ b/OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build | |||
@@ -11,10 +11,10 @@ | |||
11 | <resources prefix="OpenSim.Framework.Communications" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework.Communications" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="IUserServices.cs" /> | ||
15 | <include name="IGridServices.cs" /> | ||
16 | <include name="CommunicationsManager.cs" /> | 14 | <include name="CommunicationsManager.cs" /> |
15 | <include name="IGridServices.cs" /> | ||
17 | <include name="IInterRegionCommunications.cs" /> | 16 | <include name="IInterRegionCommunications.cs" /> |
17 | <include name="IUserServices.cs" /> | ||
18 | <include name="Properties/AssemblyInfo.cs" /> | 18 | <include name="Properties/AssemblyInfo.cs" /> |
19 | </sources> | 19 | </sources> |
20 | <references basedir="${project::get-base-directory()}"> | 20 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj index c02a506..f3dcec5 100644 --- a/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj +++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.csproj | |||
@@ -69,10 +69,10 @@ | |||
69 | <Compile Include="AssemblyInfo.cs"> | 69 | <Compile Include="AssemblyInfo.cs"> |
70 | <SubType>Code</SubType> | 70 | <SubType>Code</SubType> |
71 | </Compile> | 71 | </Compile> |
72 | <Compile Include="LogBase.cs"> | 72 | <Compile Include="ConsoleCallbacksBase.cs"> |
73 | <SubType>Code</SubType> | 73 | <SubType>Code</SubType> |
74 | </Compile> | 74 | </Compile> |
75 | <Compile Include="ConsoleCallbacksBase.cs"> | 75 | <Compile Include="LogBase.cs"> |
76 | <SubType>Code</SubType> | 76 | <SubType>Code</SubType> |
77 | </Compile> | 77 | </Compile> |
78 | <Compile Include="MainLog.cs"> | 78 | <Compile Include="MainLog.cs"> |
diff --git a/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build index 10e72a1..eb40c0d 100644 --- a/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build +++ b/OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build | |||
@@ -12,8 +12,8 @@ | |||
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="LogBase.cs" /> | ||
16 | <include name="ConsoleCallbacksBase.cs" /> | 15 | <include name="ConsoleCallbacksBase.cs" /> |
16 | <include name="LogBase.cs" /> | ||
17 | <include name="MainLog.cs" /> | 17 | <include name="MainLog.cs" /> |
18 | </sources> | 18 | </sources> |
19 | <references basedir="${project::get-base-directory()}"> | 19 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj index c7b4870..b09cecf 100644 --- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj +++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.csproj | |||
@@ -88,15 +88,15 @@ | |||
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | </ItemGroup> | 89 | </ItemGroup> |
90 | <ItemGroup> | 90 | <ItemGroup> |
91 | <Compile Include="DB4oUserData.cs"> | ||
92 | <SubType>Code</SubType> | ||
93 | </Compile> | ||
94 | <Compile Include="DB4oGridData.cs"> | 91 | <Compile Include="DB4oGridData.cs"> |
95 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
96 | </Compile> | 93 | </Compile> |
97 | <Compile Include="DB4oManager.cs"> | 94 | <Compile Include="DB4oManager.cs"> |
98 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
99 | </Compile> | 96 | </Compile> |
97 | <Compile Include="DB4oUserData.cs"> | ||
98 | <SubType>Code</SubType> | ||
99 | </Compile> | ||
100 | <Compile Include="Properties\AssemblyInfo.cs"> | 100 | <Compile Include="Properties\AssemblyInfo.cs"> |
101 | <SubType>Code</SubType> | 101 | <SubType>Code</SubType> |
102 | </Compile> | 102 | </Compile> |
diff --git a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build index efccdc1..f124eb5 100644 --- a/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build +++ b/OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build | |||
@@ -11,9 +11,9 @@ | |||
11 | <resources prefix="OpenSim.Framework.Data.DB4o" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework.Data.DB4o" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="DB4oUserData.cs" /> | ||
15 | <include name="DB4oGridData.cs" /> | 14 | <include name="DB4oGridData.cs" /> |
16 | <include name="DB4oManager.cs" /> | 15 | <include name="DB4oManager.cs" /> |
16 | <include name="DB4oUserData.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/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj index 09a32b5..62e3887 100644 --- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj +++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj | |||
@@ -88,19 +88,19 @@ | |||
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | </ItemGroup> | 89 | </ItemGroup> |
90 | <ItemGroup> | 90 | <ItemGroup> |
91 | <Compile Include="MySQLInventoryData.cs"> | 91 | <Compile Include="MySQLGridData.cs"> |
92 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
93 | </Compile> | 93 | </Compile> |
94 | <Compile Include="MySQLUserData.cs"> | 94 | <Compile Include="MySQLInventoryData.cs"> |
95 | <SubType>Code</SubType> | 95 | <SubType>Code</SubType> |
96 | </Compile> | 96 | </Compile> |
97 | <Compile Include="MySQLManager.cs"> | 97 | <Compile Include="MySQLLogData.cs"> |
98 | <SubType>Code</SubType> | 98 | <SubType>Code</SubType> |
99 | </Compile> | 99 | </Compile> |
100 | <Compile Include="MySQLLogData.cs"> | 100 | <Compile Include="MySQLManager.cs"> |
101 | <SubType>Code</SubType> | 101 | <SubType>Code</SubType> |
102 | </Compile> | 102 | </Compile> |
103 | <Compile Include="MySQLGridData.cs"> | 103 | <Compile Include="MySQLUserData.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/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build index 3aeebbc..594ec52 100644 --- a/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build +++ b/OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build | |||
@@ -11,11 +11,11 @@ | |||
11 | <resources prefix="OpenSim.Framework.Data.MySQL" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework.Data.MySQL" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="MySQLGridData.cs" /> | ||
14 | <include name="MySQLInventoryData.cs" /> | 15 | <include name="MySQLInventoryData.cs" /> |
15 | <include name="MySQLUserData.cs" /> | ||
16 | <include name="MySQLManager.cs" /> | ||
17 | <include name="MySQLLogData.cs" /> | 16 | <include name="MySQLLogData.cs" /> |
18 | <include name="MySQLGridData.cs" /> | 17 | <include name="MySQLManager.cs" /> |
18 | <include name="MySQLUserData.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/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj index dab22ea..4ba24f1 100644 --- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj +++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj | |||
@@ -88,10 +88,10 @@ | |||
88 | </ProjectReference> | 88 | </ProjectReference> |
89 | </ItemGroup> | 89 | </ItemGroup> |
90 | <ItemGroup> | 90 | <ItemGroup> |
91 | <Compile Include="SQLiteManager.cs"> | 91 | <Compile Include="SQLiteGridData.cs"> |
92 | <SubType>Code</SubType> | 92 | <SubType>Code</SubType> |
93 | </Compile> | 93 | </Compile> |
94 | <Compile Include="SQLiteGridData.cs"> | 94 | <Compile Include="SQLiteManager.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/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build index 719fbc6..e28d0a6 100644 --- a/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build +++ b/OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build | |||
@@ -11,8 +11,8 @@ | |||
11 | <resources prefix="OpenSim.Framework.Data.SQLite" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework.Data.SQLite" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="SQLiteManager.cs" /> | ||
15 | <include name="SQLiteGridData.cs" /> | 14 | <include name="SQLiteGridData.cs" /> |
15 | <include name="SQLiteManager.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/Framework/Data/OpenSim.Framework.Data.csproj b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj index 6077266..dcafbcd 100644 --- a/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj +++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.csproj | |||
@@ -1,4 +1,4 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
@@ -6,8 +6,7 @@ | |||
6 | <ProjectGuid>{36B72A9B-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{36B72A9B-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.Data</AssemblyName> | 12 | <AssemblyName>OpenSim.Framework.Data</AssemblyName> |
@@ -16,11 +15,9 @@ | |||
16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
17 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
18 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
19 | <AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
20 | </AppDesignerFolder> | ||
21 | <RootNamespace>OpenSim.Framework.Data</RootNamespace> | 19 | <RootNamespace>OpenSim.Framework.Data</RootNamespace> |
22 | <StartupObject> | 20 | <StartupObject></StartupObject> |
23 | </StartupObject> | ||
24 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
25 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
26 | </PropertyGroup> | 23 | </PropertyGroup> |
@@ -31,8 +28,7 @@ | |||
31 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
32 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
33 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
34 | <DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
35 | </DocumentationFile> | ||
36 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
37 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
38 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
@@ -41,8 +37,7 @@ | |||
41 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
42 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
43 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
44 | <NoWarn> | 40 | <NoWarn></NoWarn> |
45 | </NoWarn> | ||
46 | </PropertyGroup> | 41 | </PropertyGroup> |
47 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
48 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
@@ -51,8 +46,7 @@ | |||
51 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
52 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
53 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE</DefineConstants> |
54 | <DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
55 | </DocumentationFile> | ||
56 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
57 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
58 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
@@ -61,34 +55,29 @@ | |||
61 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
62 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
63 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
64 | <NoWarn> | 58 | <NoWarn></NoWarn> |
65 | </NoWarn> | ||
66 | </PropertyGroup> | 59 | </PropertyGroup> |
67 | <ItemGroup> | 60 | <ItemGroup> |
68 | <Reference Include="libsecondlife.dll"> | 61 | <Reference Include="libsecondlife.dll" > |
69 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | 62 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> |
70 | <Private>False</Private> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
72 | <Reference Include="System"> | 65 | <Reference Include="System" > |
73 | <HintPath>System.dll</HintPath> | 66 | <HintPath>System.dll</HintPath> |
74 | <Private>False</Private> | 67 | <Private>False</Private> |
75 | </Reference> | 68 | </Reference> |
76 | <Reference Include="System.Data"> | 69 | <Reference Include="System.Data" > |
77 | <HintPath>System.Data.dll</HintPath> | 70 | <HintPath>System.Data.dll</HintPath> |
78 | <Private>False</Private> | 71 | <Private>False</Private> |
79 | </Reference> | 72 | </Reference> |
80 | <Reference Include="System.Xml"> | 73 | <Reference Include="System.Xml" > |
81 | <HintPath>System.Xml.dll</HintPath> | 74 | <HintPath>System.Xml.dll</HintPath> |
82 | <Private>False</Private> | 75 | <Private>False</Private> |
83 | </Reference> | 76 | </Reference> |
84 | <Reference Include="XMLRPC, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL" /> | ||
85 | </ItemGroup> | 77 | </ItemGroup> |
86 | <ItemGroup> | 78 | <ItemGroup> |
87 | </ItemGroup> | 79 | </ItemGroup> |
88 | <ItemGroup> | 80 | <ItemGroup> |
89 | <Compile Include="ReservationData.cs"> | ||
90 | <SubType>Code</SubType> | ||
91 | </Compile> | ||
92 | <Compile Include="GridData.cs"> | 81 | <Compile Include="GridData.cs"> |
93 | <SubType>Code</SubType> | 82 | <SubType>Code</SubType> |
94 | </Compile> | 83 | </Compile> |
@@ -101,13 +90,16 @@ | |||
101 | <Compile Include="InventoryData.cs"> | 90 | <Compile Include="InventoryData.cs"> |
102 | <SubType>Code</SubType> | 91 | <SubType>Code</SubType> |
103 | </Compile> | 92 | </Compile> |
104 | <Compile Include="UserData.cs"> | 93 | <Compile Include="ReservationData.cs"> |
105 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
106 | </Compile> | 95 | </Compile> |
107 | <Compile Include="UserProfileData.cs"> | 96 | <Compile Include="SimProfileData.cs"> |
108 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
109 | </Compile> | 98 | </Compile> |
110 | <Compile Include="SimProfileData.cs"> | 99 | <Compile Include="UserData.cs"> |
100 | <SubType>Code</SubType> | ||
101 | </Compile> | ||
102 | <Compile Include="UserProfileData.cs"> | ||
111 | <SubType>Code</SubType> | 103 | <SubType>Code</SubType> |
112 | </Compile> | 104 | </Compile> |
113 | <Compile Include="Properties\AssemblyInfo.cs"> | 105 | <Compile Include="Properties\AssemblyInfo.cs"> |
@@ -121,4 +113,4 @@ | |||
121 | <PostBuildEvent> | 113 | <PostBuildEvent> |
122 | </PostBuildEvent> | 114 | </PostBuildEvent> |
123 | </PropertyGroup> | 115 | </PropertyGroup> |
124 | </Project> \ No newline at end of file | 116 | </Project> |
diff --git a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build index 6b489f2..aefb02b 100644 --- a/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build +++ b/OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build | |||
@@ -11,14 +11,14 @@ | |||
11 | <resources prefix="OpenSim.Framework.Data" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework.Data" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="ReservationData.cs" /> | ||
15 | <include name="GridData.cs" /> | 14 | <include name="GridData.cs" /> |
16 | <include name="ILogData.cs" /> | 15 | <include name="ILogData.cs" /> |
17 | <include name="IniConfig.cs" /> | 16 | <include name="IniConfig.cs" /> |
18 | <include name="InventoryData.cs" /> | 17 | <include name="InventoryData.cs" /> |
18 | <include name="ReservationData.cs" /> | ||
19 | <include name="SimProfileData.cs" /> | ||
19 | <include name="UserData.cs" /> | 20 | <include name="UserData.cs" /> |
20 | <include name="UserProfileData.cs" /> | 21 | <include name="UserProfileData.cs" /> |
21 | <include name="SimProfileData.cs" /> | ||
22 | <include name="Properties/AssemblyInfo.cs" /> | 22 | <include name="Properties/AssemblyInfo.cs" /> |
23 | </sources> | 23 | </sources> |
24 | <references basedir="${project::get-base-directory()}"> | 24 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj index 4a72db0..c5124cd 100644 --- a/OpenSim/Framework/General/OpenSim.Framework.csproj +++ b/OpenSim/Framework/General/OpenSim.Framework.csproj | |||
@@ -97,100 +97,100 @@ | |||
97 | <Compile Include="BlockingQueue.cs"> | 97 | <Compile Include="BlockingQueue.cs"> |
98 | <SubType>Code</SubType> | 98 | <SubType>Code</SubType> |
99 | </Compile> | 99 | </Compile> |
100 | <Compile Include="Util.cs"> | 100 | <Compile Include="IRegionCommsListener.cs"> |
101 | <SubType>Code</SubType> | 101 | <SubType>Code</SubType> |
102 | </Compile> | 102 | </Compile> |
103 | <Compile Include="UserProfile.cs"> | 103 | <Compile Include="LoginService.cs"> |
104 | <SubType>Code</SubType> | 104 | <SubType>Code</SubType> |
105 | </Compile> | 105 | </Compile> |
106 | <Compile Include="IRegionCommsListener.cs"> | 106 | <Compile Include="RegionCommsListener.cs"> |
107 | <SubType>Code</SubType> | 107 | <SubType>Code</SubType> |
108 | </Compile> | 108 | </Compile> |
109 | <Compile Include="Remoting.cs"> | 109 | <Compile Include="Remoting.cs"> |
110 | <SubType>Code</SubType> | 110 | <SubType>Code</SubType> |
111 | </Compile> | 111 | </Compile> |
112 | <Compile Include="RegionCommsListener.cs"> | 112 | <Compile Include="UserProfile.cs"> |
113 | <SubType>Code</SubType> | 113 | <SubType>Code</SubType> |
114 | </Compile> | 114 | </Compile> |
115 | <Compile Include="LoginService.cs"> | 115 | <Compile Include="Util.cs"> |
116 | <SubType>Code</SubType> | 116 | <SubType>Code</SubType> |
117 | </Compile> | 117 | </Compile> |
118 | <Compile Include="Interfaces\AuthenticateResponse.cs"> | 118 | <Compile Include="Interfaces\AuthenticateResponse.cs"> |
119 | <SubType>Code</SubType> | 119 | <SubType>Code</SubType> |
120 | </Compile> | 120 | </Compile> |
121 | <Compile Include="Interfaces\IUserServer.cs"> | 121 | <Compile Include="Interfaces\IAssetServer.cs"> |
122 | <SubType>Code</SubType> | 122 | <SubType>Code</SubType> |
123 | </Compile> | 123 | </Compile> |
124 | <Compile Include="Interfaces\IAssetServer.cs"> | 124 | <Compile Include="Interfaces\IClientAPI.cs"> |
125 | <SubType>Code</SubType> | 125 | <SubType>Code</SubType> |
126 | </Compile> | 126 | </Compile> |
127 | <Compile Include="Interfaces\IWorld.cs"> | 127 | <Compile Include="Interfaces\ILocalStorage.cs"> |
128 | <SubType>Code</SubType> | 128 | <SubType>Code</SubType> |
129 | </Compile> | 129 | </Compile> |
130 | <Compile Include="Interfaces\IClientAPI.cs"> | 130 | <Compile Include="Interfaces\IUserServer.cs"> |
131 | <SubType>Code</SubType> | 131 | <SubType>Code</SubType> |
132 | </Compile> | 132 | </Compile> |
133 | <Compile Include="Interfaces\ILocalStorage.cs"> | 133 | <Compile Include="Interfaces\IWorld.cs"> |
134 | <SubType>Code</SubType> | 134 | <SubType>Code</SubType> |
135 | </Compile> | 135 | </Compile> |
136 | <Compile Include="Interfaces\Config\IGenericConfig.cs"> | 136 | <Compile Include="Interfaces\Config\IGenericConfig.cs"> |
137 | <SubType>Code</SubType> | 137 | <SubType>Code</SubType> |
138 | </Compile> | 138 | </Compile> |
139 | <Compile Include="Interfaces\Config\IUserConfig.cs"> | 139 | <Compile Include="Interfaces\Config\IGridConfig.cs"> |
140 | <SubType>Code</SubType> | 140 | <SubType>Code</SubType> |
141 | </Compile> | 141 | </Compile> |
142 | <Compile Include="Interfaces\Config\IGridConfig.cs"> | 142 | <Compile Include="Interfaces\Config\IUserConfig.cs"> |
143 | <SubType>Code</SubType> | 143 | <SubType>Code</SubType> |
144 | </Compile> | 144 | </Compile> |
145 | <Compile Include="Types\MapBlockData.cs"> | 145 | <Compile Include="Properties\AssemblyInfo.cs"> |
146 | <SubType>Code</SubType> | 146 | <SubType>Code</SubType> |
147 | </Compile> | 147 | </Compile> |
148 | <Compile Include="Types\PrimitiveBaseShape.cs"> | 148 | <Compile Include="Types\AgentCiruitData.cs"> |
149 | <SubType>Code</SubType> | 149 | <SubType>Code</SubType> |
150 | </Compile> | 150 | </Compile> |
151 | <Compile Include="Types\AssetLandmark.cs"> | 151 | <Compile Include="Types\AgentWearable.cs"> |
152 | <SubType>Code</SubType> | 152 | <SubType>Code</SubType> |
153 | </Compile> | 153 | </Compile> |
154 | <Compile Include="Types\NeighbourInfo.cs"> | 154 | <Compile Include="Types\AssetBase.cs"> |
155 | <SubType>Code</SubType> | 155 | <SubType>Code</SubType> |
156 | </Compile> | 156 | </Compile> |
157 | <Compile Include="Types\RegionInfo.cs"> | 157 | <Compile Include="Types\AssetLandmark.cs"> |
158 | <SubType>Code</SubType> | 158 | <SubType>Code</SubType> |
159 | </Compile> | 159 | </Compile> |
160 | <Compile Include="Types\RegionHandle.cs"> | 160 | <Compile Include="Types\AssetStorage.cs"> |
161 | <SubType>Code</SubType> | 161 | <SubType>Code</SubType> |
162 | </Compile> | 162 | </Compile> |
163 | <Compile Include="Types\ParcelData.cs"> | 163 | <Compile Include="Types\EstateSettings.cs"> |
164 | <SubType>Code</SubType> | 164 | <SubType>Code</SubType> |
165 | </Compile> | 165 | </Compile> |
166 | <Compile Include="Types\PrimData.cs"> | 166 | <Compile Include="Types\Login.cs"> |
167 | <SubType>Code</SubType> | 167 | <SubType>Code</SubType> |
168 | </Compile> | 168 | </Compile> |
169 | <Compile Include="Types\AgentWearable.cs"> | 169 | <Compile Include="Types\MapBlockData.cs"> |
170 | <SubType>Code</SubType> | 170 | <SubType>Code</SubType> |
171 | </Compile> | 171 | </Compile> |
172 | <Compile Include="Types\AssetStorage.cs"> | 172 | <Compile Include="Types\NeighbourInfo.cs"> |
173 | <SubType>Code</SubType> | 173 | <SubType>Code</SubType> |
174 | </Compile> | 174 | </Compile> |
175 | <Compile Include="Types\UUID.cs"> | 175 | <Compile Include="Types\NetworkServersInfo.cs"> |
176 | <SubType>Code</SubType> | 176 | <SubType>Code</SubType> |
177 | </Compile> | 177 | </Compile> |
178 | <Compile Include="Types\EstateSettings.cs"> | 178 | <Compile Include="Types\ParcelData.cs"> |
179 | <SubType>Code</SubType> | 179 | <SubType>Code</SubType> |
180 | </Compile> | 180 | </Compile> |
181 | <Compile Include="Types\Login.cs"> | 181 | <Compile Include="Types\PrimData.cs"> |
182 | <SubType>Code</SubType> | 182 | <SubType>Code</SubType> |
183 | </Compile> | 183 | </Compile> |
184 | <Compile Include="Types\AgentCiruitData.cs"> | 184 | <Compile Include="Types\PrimitiveBaseShape.cs"> |
185 | <SubType>Code</SubType> | 185 | <SubType>Code</SubType> |
186 | </Compile> | 186 | </Compile> |
187 | <Compile Include="Types\AssetBase.cs"> | 187 | <Compile Include="Types\RegionHandle.cs"> |
188 | <SubType>Code</SubType> | 188 | <SubType>Code</SubType> |
189 | </Compile> | 189 | </Compile> |
190 | <Compile Include="Types\NetworkServersInfo.cs"> | 190 | <Compile Include="Types\RegionInfo.cs"> |
191 | <SubType>Code</SubType> | 191 | <SubType>Code</SubType> |
192 | </Compile> | 192 | </Compile> |
193 | <Compile Include="Properties\AssemblyInfo.cs"> | 193 | <Compile Include="Types\UUID.cs"> |
194 | <SubType>Code</SubType> | 194 | <SubType>Code</SubType> |
195 | </Compile> | 195 | </Compile> |
196 | </ItemGroup> | 196 | </ItemGroup> |
diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build index 9fb35bc..a44f0fc 100644 --- a/OpenSim/Framework/General/OpenSim.Framework.dll.build +++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build | |||
@@ -14,38 +14,38 @@ | |||
14 | <include name="AgentInventory.cs" /> | 14 | <include name="AgentInventory.cs" /> |
15 | <include name="AuthenticateSessionBase.cs" /> | 15 | <include name="AuthenticateSessionBase.cs" /> |
16 | <include name="BlockingQueue.cs" /> | 16 | <include name="BlockingQueue.cs" /> |
17 | <include name="Util.cs" /> | ||
18 | <include name="UserProfile.cs" /> | ||
19 | <include name="IRegionCommsListener.cs" /> | 17 | <include name="IRegionCommsListener.cs" /> |
20 | <include name="Remoting.cs" /> | ||
21 | <include name="RegionCommsListener.cs" /> | ||
22 | <include name="LoginService.cs" /> | 18 | <include name="LoginService.cs" /> |
19 | <include name="RegionCommsListener.cs" /> | ||
20 | <include name="Remoting.cs" /> | ||
21 | <include name="UserProfile.cs" /> | ||
22 | <include name="Util.cs" /> | ||
23 | <include name="Interfaces/AuthenticateResponse.cs" /> | 23 | <include name="Interfaces/AuthenticateResponse.cs" /> |
24 | <include name="Interfaces/IUserServer.cs" /> | ||
25 | <include name="Interfaces/IAssetServer.cs" /> | 24 | <include name="Interfaces/IAssetServer.cs" /> |
26 | <include name="Interfaces/IWorld.cs" /> | ||
27 | <include name="Interfaces/IClientAPI.cs" /> | 25 | <include name="Interfaces/IClientAPI.cs" /> |
28 | <include name="Interfaces/ILocalStorage.cs" /> | 26 | <include name="Interfaces/ILocalStorage.cs" /> |
27 | <include name="Interfaces/IUserServer.cs" /> | ||
28 | <include name="Interfaces/IWorld.cs" /> | ||
29 | <include name="Interfaces/Config/IGenericConfig.cs" /> | 29 | <include name="Interfaces/Config/IGenericConfig.cs" /> |
30 | <include name="Interfaces/Config/IUserConfig.cs" /> | ||
31 | <include name="Interfaces/Config/IGridConfig.cs" /> | 30 | <include name="Interfaces/Config/IGridConfig.cs" /> |
32 | <include name="Types/MapBlockData.cs" /> | 31 | <include name="Interfaces/Config/IUserConfig.cs" /> |
33 | <include name="Types/PrimitiveBaseShape.cs" /> | 32 | <include name="Properties/AssemblyInfo.cs" /> |
34 | <include name="Types/AssetLandmark.cs" /> | 33 | <include name="Types/AgentCiruitData.cs" /> |
35 | <include name="Types/NeighbourInfo.cs" /> | ||
36 | <include name="Types/RegionInfo.cs" /> | ||
37 | <include name="Types/RegionHandle.cs" /> | ||
38 | <include name="Types/ParcelData.cs" /> | ||
39 | <include name="Types/PrimData.cs" /> | ||
40 | <include name="Types/AgentWearable.cs" /> | 34 | <include name="Types/AgentWearable.cs" /> |
35 | <include name="Types/AssetBase.cs" /> | ||
36 | <include name="Types/AssetLandmark.cs" /> | ||
41 | <include name="Types/AssetStorage.cs" /> | 37 | <include name="Types/AssetStorage.cs" /> |
42 | <include name="Types/UUID.cs" /> | ||
43 | <include name="Types/EstateSettings.cs" /> | 38 | <include name="Types/EstateSettings.cs" /> |
44 | <include name="Types/Login.cs" /> | 39 | <include name="Types/Login.cs" /> |
45 | <include name="Types/AgentCiruitData.cs" /> | 40 | <include name="Types/MapBlockData.cs" /> |
46 | <include name="Types/AssetBase.cs" /> | 41 | <include name="Types/NeighbourInfo.cs" /> |
47 | <include name="Types/NetworkServersInfo.cs" /> | 42 | <include name="Types/NetworkServersInfo.cs" /> |
48 | <include name="Properties/AssemblyInfo.cs" /> | 43 | <include name="Types/ParcelData.cs" /> |
44 | <include name="Types/PrimData.cs" /> | ||
45 | <include name="Types/PrimitiveBaseShape.cs" /> | ||
46 | <include name="Types/RegionHandle.cs" /> | ||
47 | <include name="Types/RegionInfo.cs" /> | ||
48 | <include name="Types/UUID.cs" /> | ||
49 | </sources> | 49 | </sources> |
50 | <references basedir="${project::get-base-directory()}"> | 50 | <references basedir="${project::get-base-directory()}"> |
51 | <lib> | 51 | <lib> |
diff --git a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj index 7fbb581..424072e 100644 --- a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj +++ b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.csproj | |||
@@ -114,10 +114,10 @@ | |||
114 | </ProjectReference> | 114 | </ProjectReference> |
115 | </ItemGroup> | 115 | </ItemGroup> |
116 | <ItemGroup> | 116 | <ItemGroup> |
117 | <Compile Include="Main.cs"> | 117 | <Compile Include="GridManager.cs"> |
118 | <SubType>Code</SubType> | 118 | <SubType>Code</SubType> |
119 | </Compile> | 119 | </Compile> |
120 | <Compile Include="GridManager.cs"> | 120 | <Compile Include="Main.cs"> |
121 | <SubType>Code</SubType> | 121 | <SubType>Code</SubType> |
122 | </Compile> | 122 | </Compile> |
123 | <Compile Include="Properties\AssemblyInfo.cs"> | 123 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build index 45cf353..4cadf1d 100644 --- a/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build +++ b/OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build | |||
@@ -11,8 +11,8 @@ | |||
11 | <resources prefix="OpenSim.Grid.GridServer" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Grid.GridServer" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="Main.cs" /> | ||
15 | <include name="GridManager.cs" /> | 14 | <include name="GridManager.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/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj index f5da23d..bec85cc 100644 --- a/OpenSim/Region/Application/OpenSim.csproj +++ b/OpenSim/Region/Application/OpenSim.csproj | |||
@@ -170,15 +170,15 @@ | |||
170 | </ProjectReference> | 170 | </ProjectReference> |
171 | </ItemGroup> | 171 | </ItemGroup> |
172 | <ItemGroup> | 172 | <ItemGroup> |
173 | <Compile Include="VersionInfo.cs"> | ||
174 | <SubType>Code</SubType> | ||
175 | </Compile> | ||
176 | <Compile Include="Application.cs"> | 173 | <Compile Include="Application.cs"> |
177 | <SubType>Code</SubType> | 174 | <SubType>Code</SubType> |
178 | </Compile> | 175 | </Compile> |
179 | <Compile Include="OpenSimMain.cs"> | 176 | <Compile Include="OpenSimMain.cs"> |
180 | <SubType>Code</SubType> | 177 | <SubType>Code</SubType> |
181 | </Compile> | 178 | </Compile> |
179 | <Compile Include="VersionInfo.cs"> | ||
180 | <SubType>Code</SubType> | ||
181 | </Compile> | ||
182 | </ItemGroup> | 182 | </ItemGroup> |
183 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 183 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
184 | <PropertyGroup> | 184 | <PropertyGroup> |
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build index 9890cfa..6c7d7ac 100644 --- a/OpenSim/Region/Application/OpenSim.exe.build +++ b/OpenSim/Region/Application/OpenSim.exe.build | |||
@@ -11,9 +11,9 @@ | |||
11 | <resources prefix="OpenSim" dynamicprefix="true" > | 11 | <resources prefix="OpenSim" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="VersionInfo.cs" /> | ||
15 | <include name="Application.cs" /> | 14 | <include name="Application.cs" /> |
16 | <include name="OpenSimMain.cs" /> | 15 | <include name="OpenSimMain.cs" /> |
16 | <include name="VersionInfo.cs" /> | ||
17 | </sources> | 17 | </sources> |
18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
19 | <lib> | 19 | <lib> |
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj index 2e1d8e2..3093eb0 100644 --- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj +++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj | |||
@@ -122,34 +122,34 @@ | |||
122 | </ProjectReference> | 122 | </ProjectReference> |
123 | </ItemGroup> | 123 | </ItemGroup> |
124 | <ItemGroup> | 124 | <ItemGroup> |
125 | <Compile Include="ClientView.AgentAssetUpload.cs"> | 125 | <Compile Include="ClientStackNetworkHandler.cs"> |
126 | <SubType>Code</SubType> | 126 | <SubType>Code</SubType> |
127 | </Compile> | 127 | </Compile> |
128 | <Compile Include="ClientStackNetworkHandler.cs"> | 128 | <Compile Include="ClientView.AgentAssetUpload.cs"> |
129 | <SubType>Code</SubType> | 129 | <SubType>Code</SubType> |
130 | </Compile> | 130 | </Compile> |
131 | <Compile Include="PacketServer.cs"> | 131 | <Compile Include="ClientView.API.cs"> |
132 | <SubType>Code</SubType> | 132 | <SubType>Code</SubType> |
133 | </Compile> | 133 | </Compile> |
134 | <Compile Include="UDPServer.cs"> | 134 | <Compile Include="ClientView.cs"> |
135 | <SubType>Code</SubType> | 135 | <SubType>Code</SubType> |
136 | </Compile> | 136 | </Compile> |
137 | <Compile Include="ClientView.PacketHandlers.cs"> | 137 | <Compile Include="ClientView.PacketHandlers.cs"> |
138 | <SubType>Code</SubType> | 138 | <SubType>Code</SubType> |
139 | </Compile> | 139 | </Compile> |
140 | <Compile Include="ClientView.API.cs"> | 140 | <Compile Include="ClientView.ProcessPackets.cs"> |
141 | <SubType>Code</SubType> | 141 | <SubType>Code</SubType> |
142 | </Compile> | 142 | </Compile> |
143 | <Compile Include="ClientView.ProcessPackets.cs"> | 143 | <Compile Include="ClientViewBase.cs"> |
144 | <SubType>Code</SubType> | 144 | <SubType>Code</SubType> |
145 | </Compile> | 145 | </Compile> |
146 | <Compile Include="RegionApplicationBase.cs"> | 146 | <Compile Include="PacketServer.cs"> |
147 | <SubType>Code</SubType> | 147 | <SubType>Code</SubType> |
148 | </Compile> | 148 | </Compile> |
149 | <Compile Include="ClientViewBase.cs"> | 149 | <Compile Include="RegionApplicationBase.cs"> |
150 | <SubType>Code</SubType> | 150 | <SubType>Code</SubType> |
151 | </Compile> | 151 | </Compile> |
152 | <Compile Include="ClientView.cs"> | 152 | <Compile Include="UDPServer.cs"> |
153 | <SubType>Code</SubType> | 153 | <SubType>Code</SubType> |
154 | </Compile> | 154 | </Compile> |
155 | <Compile Include="Assets\InventoryCache.cs"> | 155 | <Compile Include="Assets\InventoryCache.cs"> |
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build index 1c791d3..f76a4c8 100644 --- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build +++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build | |||
@@ -11,16 +11,16 @@ | |||
11 | <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="ClientView.AgentAssetUpload.cs" /> | ||
15 | <include name="ClientStackNetworkHandler.cs" /> | 14 | <include name="ClientStackNetworkHandler.cs" /> |
16 | <include name="PacketServer.cs" /> | 15 | <include name="ClientView.AgentAssetUpload.cs" /> |
17 | <include name="UDPServer.cs" /> | ||
18 | <include name="ClientView.PacketHandlers.cs" /> | ||
19 | <include name="ClientView.API.cs" /> | 16 | <include name="ClientView.API.cs" /> |
17 | <include name="ClientView.cs" /> | ||
18 | <include name="ClientView.PacketHandlers.cs" /> | ||
20 | <include name="ClientView.ProcessPackets.cs" /> | 19 | <include name="ClientView.ProcessPackets.cs" /> |
21 | <include name="RegionApplicationBase.cs" /> | ||
22 | <include name="ClientViewBase.cs" /> | 20 | <include name="ClientViewBase.cs" /> |
23 | <include name="ClientView.cs" /> | 21 | <include name="PacketServer.cs" /> |
22 | <include name="RegionApplicationBase.cs" /> | ||
23 | <include name="UDPServer.cs" /> | ||
24 | <include name="Assets/InventoryCache.cs" /> | 24 | <include name="Assets/InventoryCache.cs" /> |
25 | </sources> | 25 | </sources> |
26 | <references basedir="${project::get-base-directory()}"> | 26 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj index f9f6b7d..0a15a49 100644 --- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj +++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj | |||
@@ -98,15 +98,15 @@ | |||
98 | </ProjectReference> | 98 | </ProjectReference> |
99 | </ItemGroup> | 99 | </ItemGroup> |
100 | <ItemGroup> | 100 | <ItemGroup> |
101 | <Compile Include="LocalUserServices.cs"> | ||
102 | <SubType>Code</SubType> | ||
103 | </Compile> | ||
104 | <Compile Include="CommunicationsLocal.cs"> | 101 | <Compile Include="CommunicationsLocal.cs"> |
105 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
106 | </Compile> | 103 | </Compile> |
107 | <Compile Include="LocalBackEndServices.cs"> | 104 | <Compile Include="LocalBackEndServices.cs"> |
108 | <SubType>Code</SubType> | 105 | <SubType>Code</SubType> |
109 | </Compile> | 106 | </Compile> |
107 | <Compile Include="LocalUserServices.cs"> | ||
108 | <SubType>Code</SubType> | ||
109 | </Compile> | ||
110 | <Compile Include="Properties\AssemblyInfo.cs"> | 110 | <Compile Include="Properties\AssemblyInfo.cs"> |
111 | <SubType>Code</SubType> | 111 | <SubType>Code</SubType> |
112 | </Compile> | 112 | </Compile> |
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build index bfefabf..3cac9d3 100644 --- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build +++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build | |||
@@ -11,9 +11,9 @@ | |||
11 | <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="LocalUserServices.cs" /> | ||
15 | <include name="CommunicationsLocal.cs" /> | 14 | <include name="CommunicationsLocal.cs" /> |
16 | <include name="LocalBackEndServices.cs" /> | 15 | <include name="LocalBackEndServices.cs" /> |
16 | <include name="LocalUserServices.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/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj index 390326e..d6abd13 100644 --- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj +++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj | |||
@@ -116,16 +116,16 @@ | |||
116 | </ProjectReference> | 116 | </ProjectReference> |
117 | </ItemGroup> | 117 | </ItemGroup> |
118 | <ItemGroup> | 118 | <ItemGroup> |
119 | <Compile Include="OGS1UserServices.cs"> | 119 | <Compile Include="CommunicationsOGS1.cs"> |
120 | <SubType>Code</SubType> | 120 | <SubType>Code</SubType> |
121 | </Compile> | 121 | </Compile> |
122 | <Compile Include="CommunicationsOGS1.cs"> | 122 | <Compile Include="OGS1GridServices.cs"> |
123 | <SubType>Code</SubType> | 123 | <SubType>Code</SubType> |
124 | </Compile> | 124 | </Compile> |
125 | <Compile Include="OGS1InterSimComms.cs"> | 125 | <Compile Include="OGS1InterSimComms.cs"> |
126 | <SubType>Code</SubType> | 126 | <SubType>Code</SubType> |
127 | </Compile> | 127 | </Compile> |
128 | <Compile Include="OGS1GridServices.cs"> | 128 | <Compile Include="OGS1UserServices.cs"> |
129 | <SubType>Code</SubType> | 129 | <SubType>Code</SubType> |
130 | </Compile> | 130 | </Compile> |
131 | <Compile Include="Properties\AssemblyInfo.cs"> | 131 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build index 06f0b9e..04d61b9 100644 --- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build +++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build | |||
@@ -11,10 +11,10 @@ | |||
11 | <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="OGS1UserServices.cs" /> | ||
15 | <include name="CommunicationsOGS1.cs" /> | 14 | <include name="CommunicationsOGS1.cs" /> |
16 | <include name="OGS1InterSimComms.cs" /> | ||
17 | <include name="OGS1GridServices.cs" /> | 15 | <include name="OGS1GridServices.cs" /> |
16 | <include name="OGS1InterSimComms.cs" /> | ||
17 | <include name="OGS1UserServices.cs" /> | ||
18 | <include name="Properties/AssemblyInfo.cs" /> | 18 | <include name="Properties/AssemblyInfo.cs" /> |
19 | </sources> | 19 | </sources> |
20 | <references basedir="${project::get-base-directory()}"> | 20 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj index 3b86468..048f326 100644 --- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj +++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.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>{DCBA491C-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{DCBA491C-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | </ApplicationIcon> | ||
11 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
12 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
13 | <AssemblyName>OpenSim.Region.Environment</AssemblyName> | 12 | <AssemblyName>OpenSim.Region.Environment</AssemblyName> |
@@ -16,11 +15,9 @@ | |||
16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
17 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
18 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
19 | <AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
20 | </AppDesignerFolder> | ||
21 | <RootNamespace>OpenSim.Region.Environment</RootNamespace> | 19 | <RootNamespace>OpenSim.Region.Environment</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,36 +55,34 @@ | |||
61 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
62 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
63 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
64 | <NoWarn> | 58 | <NoWarn></NoWarn> |
65 | </NoWarn> | ||
66 | </PropertyGroup> | 59 | </PropertyGroup> |
67 | <ItemGroup> | 60 | <ItemGroup> |
68 | <Reference Include="Axiom.MathLib.dll"> | 61 | <Reference Include="Axiom.MathLib.dll" > |
69 | <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath> | 62 | <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath> |
70 | <Private>False</Private> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
72 | <Reference Include="Db4objects.Db4o.dll"> | 65 | <Reference Include="Db4objects.Db4o.dll" > |
73 | <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath> | 66 | <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath> |
74 | <Private>False</Private> | 67 | <Private>False</Private> |
75 | </Reference> | 68 | </Reference> |
76 | <Reference Include="libsecondlife.dll"> | 69 | <Reference Include="libsecondlife.dll" > |
77 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | 70 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> |
78 | <Private>False</Private> | 71 | <Private>False</Private> |
79 | </Reference> | 72 | </Reference> |
80 | <Reference Include="Microsoft.JScript"> | 73 | <Reference Include="Microsoft.JScript" > |
81 | <HintPath>Microsoft.JScript.dll</HintPath> | 74 | <HintPath>Microsoft.JScript.dll</HintPath> |
82 | <Private>False</Private> | 75 | <Private>False</Private> |
83 | </Reference> | 76 | </Reference> |
84 | <Reference Include="System"> | 77 | <Reference Include="System" > |
85 | <HintPath>System.dll</HintPath> | 78 | <HintPath>System.dll</HintPath> |
86 | <Private>False</Private> | 79 | <Private>False</Private> |
87 | </Reference> | 80 | </Reference> |
88 | <Reference Include="System.Data" /> | 81 | <Reference Include="System.Xml" > |
89 | <Reference Include="System.Xml"> | ||
90 | <HintPath>System.Xml.dll</HintPath> | 82 | <HintPath>System.Xml.dll</HintPath> |
91 | <Private>False</Private> | 83 | <Private>False</Private> |
92 | </Reference> | 84 | </Reference> |
93 | <Reference Include="XMLRPC.dll"> | 85 | <Reference Include="XMLRPC.dll" > |
94 | <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> | 86 | <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> |
95 | <Private>False</Private> | 87 | <Private>False</Private> |
96 | </Reference> | 88 | </Reference> |
@@ -100,55 +92,55 @@ | |||
100 | <Name>OpenSim.Framework</Name> | 92 | <Name>OpenSim.Framework</Name> |
101 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 93 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
102 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 94 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
103 | <Private>False</Private> | 95 | <Private>False</Private> |
104 | </ProjectReference> | 96 | </ProjectReference> |
105 | <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj"> | 97 | <ProjectReference Include="..\..\Framework\Communications\OpenSim.Framework.Communications.csproj"> |
106 | <Name>OpenSim.Framework.Communications</Name> | 98 | <Name>OpenSim.Framework.Communications</Name> |
107 | <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project> | 99 | <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project> |
108 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 100 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
109 | <Private>False</Private> | 101 | <Private>False</Private> |
110 | </ProjectReference> | 102 | </ProjectReference> |
111 | <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj"> | 103 | <ProjectReference Include="..\..\Framework\Console\OpenSim.Framework.Console.csproj"> |
112 | <Name>OpenSim.Framework.Console</Name> | 104 | <Name>OpenSim.Framework.Console</Name> |
113 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 105 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> |
114 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 106 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
115 | <Private>False</Private> | 107 | <Private>False</Private> |
116 | </ProjectReference> | 108 | </ProjectReference> |
117 | <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj"> | 109 | <ProjectReference Include="..\..\Framework\GenericConfig\Xml\OpenSim.Framework.GenericConfig.Xml.csproj"> |
118 | <Name>OpenSim.Framework.GenericConfig.Xml</Name> | 110 | <Name>OpenSim.Framework.GenericConfig.Xml</Name> |
119 | <Project>{C74E4A30-0000-0000-0000-000000000000}</Project> | 111 | <Project>{C74E4A30-0000-0000-0000-000000000000}</Project> |
120 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 112 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
121 | <Private>False</Private> | 113 | <Private>False</Private> |
122 | </ProjectReference> | 114 | </ProjectReference> |
123 | <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj"> | 115 | <ProjectReference Include="..\..\Framework\Servers\OpenSim.Framework.Servers.csproj"> |
124 | <Name>OpenSim.Framework.Servers</Name> | 116 | <Name>OpenSim.Framework.Servers</Name> |
125 | <Project>{2CC71860-0000-0000-0000-000000000000}</Project> | 117 | <Project>{2CC71860-0000-0000-0000-000000000000}</Project> |
126 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 118 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
127 | <Private>False</Private> | 119 | <Private>False</Private> |
128 | </ProjectReference> | 120 | </ProjectReference> |
129 | <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj"> | 121 | <ProjectReference Include="..\Caches\OpenSim.Region.Caches.csproj"> |
130 | <Name>OpenSim.Region.Caches</Name> | 122 | <Name>OpenSim.Region.Caches</Name> |
131 | <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project> | 123 | <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project> |
132 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 124 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
133 | <Private>False</Private> | 125 | <Private>False</Private> |
134 | </ProjectReference> | 126 | </ProjectReference> |
135 | <ProjectReference Include="..\Capabilities\OpenSim.Region.Capabilities.csproj"> | 127 | <ProjectReference Include="..\Capabilities\OpenSim.Region.Capabilities.csproj"> |
136 | <Name>OpenSim.Region.Capabilities</Name> | 128 | <Name>OpenSim.Region.Capabilities</Name> |
137 | <Project>{39038E85-0000-0000-0000-000000000000}</Project> | 129 | <Project>{39038E85-0000-0000-0000-000000000000}</Project> |
138 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 130 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
139 | <Private>False</Private> | 131 | <Private>False</Private> |
140 | </ProjectReference> | 132 | </ProjectReference> |
141 | <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj"> | 133 | <ProjectReference Include="..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj"> |
142 | <Name>OpenSim.Region.Physics.Manager</Name> | 134 | <Name>OpenSim.Region.Physics.Manager</Name> |
143 | <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project> | 135 | <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project> |
144 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 136 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
145 | <Private>False</Private> | 137 | <Private>False</Private> |
146 | </ProjectReference> | 138 | </ProjectReference> |
147 | <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj"> | 139 | <ProjectReference Include="..\Terrain.BasicTerrain\OpenSim.Region.Terrain.BasicTerrain.csproj"> |
148 | <Name>OpenSim.Region.Terrain.BasicTerrain</Name> | 140 | <Name>OpenSim.Region.Terrain.BasicTerrain</Name> |
149 | <Project>{C9E0F891-0000-0000-0000-000000000000}</Project> | 141 | <Project>{C9E0F891-0000-0000-0000-000000000000}</Project> |
150 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 142 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
151 | <Private>False</Private> | 143 | <Private>False</Private> |
152 | </ProjectReference> | 144 | </ProjectReference> |
153 | </ItemGroup> | 145 | </ItemGroup> |
154 | <ItemGroup> | 146 | <ItemGroup> |
@@ -200,7 +192,6 @@ | |||
200 | <Compile Include="Scenes\ScenePresence.cs"> | 192 | <Compile Include="Scenes\ScenePresence.cs"> |
201 | <SubType>Code</SubType> | 193 | <SubType>Code</SubType> |
202 | </Compile> | 194 | </Compile> |
203 | <Compile Include="Scenes\scripting\Engines\JVMEngine\JavaEngine.cs" /> | ||
204 | <Compile Include="Scenes\scripting\Script.cs"> | 195 | <Compile Include="Scenes\scripting\Script.cs"> |
205 | <SubType>Code</SubType> | 196 | <SubType>Code</SubType> |
206 | </Compile> | 197 | </Compile> |
@@ -240,6 +231,9 @@ | |||
240 | <Compile Include="Scenes\scripting\Engines\JVMEngine\InterpreterReturn.cs"> | 231 | <Compile Include="Scenes\scripting\Engines\JVMEngine\InterpreterReturn.cs"> |
241 | <SubType>Code</SubType> | 232 | <SubType>Code</SubType> |
242 | </Compile> | 233 | </Compile> |
234 | <Compile Include="Scenes\scripting\Engines\JVMEngine\JavaEngine.cs"> | ||
235 | <SubType>Code</SubType> | ||
236 | </Compile> | ||
243 | <Compile Include="Scenes\scripting\Engines\JVMEngine\MainMemory.cs"> | 237 | <Compile Include="Scenes\scripting\Engines\JVMEngine\MainMemory.cs"> |
244 | <SubType>Code</SubType> | 238 | <SubType>Code</SubType> |
245 | </Compile> | 239 | </Compile> |
@@ -290,4 +284,4 @@ | |||
290 | <PostBuildEvent> | 284 | <PostBuildEvent> |
291 | </PostBuildEvent> | 285 | </PostBuildEvent> |
292 | </PropertyGroup> | 286 | </PropertyGroup> |
293 | </Project> \ No newline at end of file | 287 | </Project> |
diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build index 52d9a26..bba3266 100644 --- a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build +++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build | |||
@@ -40,6 +40,7 @@ | |||
40 | <include name="Scenes/scripting/Engines/JVMEngine/InterpreterLogic.cs" /> | 40 | <include name="Scenes/scripting/Engines/JVMEngine/InterpreterLogic.cs" /> |
41 | <include name="Scenes/scripting/Engines/JVMEngine/InterpreterMethods.cs" /> | 41 | <include name="Scenes/scripting/Engines/JVMEngine/InterpreterMethods.cs" /> |
42 | <include name="Scenes/scripting/Engines/JVMEngine/InterpreterReturn.cs" /> | 42 | <include name="Scenes/scripting/Engines/JVMEngine/InterpreterReturn.cs" /> |
43 | <include name="Scenes/scripting/Engines/JVMEngine/JavaEngine.cs" /> | ||
43 | <include name="Scenes/scripting/Engines/JVMEngine/MainMemory.cs" /> | 44 | <include name="Scenes/scripting/Engines/JVMEngine/MainMemory.cs" /> |
44 | <include name="Scenes/scripting/Engines/JVMEngine/MethodMemory.cs" /> | 45 | <include name="Scenes/scripting/Engines/JVMEngine/MethodMemory.cs" /> |
45 | <include name="Scenes/scripting/Engines/JVMEngine/Object.cs" /> | 46 | <include name="Scenes/scripting/Engines/JVMEngine/Object.cs" /> |
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj index d3f2518..1e726b2 100644 --- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj +++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj | |||
@@ -154,10 +154,10 @@ | |||
154 | </ProjectReference> | 154 | </ProjectReference> |
155 | </ItemGroup> | 155 | </ItemGroup> |
156 | <ItemGroup> | 156 | <ItemGroup> |
157 | <Compile Include="MyWorld.cs"> | 157 | <Compile Include="LlsdMethodEntry.cs"> |
158 | <SubType>Code</SubType> | 158 | <SubType>Code</SubType> |
159 | </Compile> | 159 | </Compile> |
160 | <Compile Include="LlsdMethodEntry.cs"> | 160 | <Compile Include="MyWorld.cs"> |
161 | <SubType>Code</SubType> | 161 | <SubType>Code</SubType> |
162 | </Compile> | 162 | </Compile> |
163 | <Compile Include="Program.cs"> | 163 | <Compile Include="Program.cs"> |
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build index ffcf59e..a826a37 100644 --- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build +++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build | |||
@@ -11,8 +11,8 @@ | |||
11 | <resources prefix="SimpleApp" dynamicprefix="true" > | 11 | <resources prefix="SimpleApp" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="MyWorld.cs" /> | ||
15 | <include name="LlsdMethodEntry.cs" /> | 14 | <include name="LlsdMethodEntry.cs" /> |
15 | <include name="MyWorld.cs" /> | ||
16 | <include name="Program.cs" /> | 16 | <include name="Program.cs" /> |
17 | <include name="Properties/AssemblyInfo.cs" /> | 17 | <include name="Properties/AssemblyInfo.cs" /> |
18 | </sources> | 18 | </sources> |
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj index 716fd57..147158c 100644 --- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj +++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj | |||
@@ -93,6 +93,9 @@ | |||
93 | <Compile Include="AssemblyInfo.cs"> | 93 | <Compile Include="AssemblyInfo.cs"> |
94 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
95 | </Compile> | 95 | </Compile> |
96 | <Compile Include="Db4LocalStorage.cs"> | ||
97 | <SubType>Code</SubType> | ||
98 | </Compile> | ||
96 | <Compile Include="MapStorage.cs"> | 99 | <Compile Include="MapStorage.cs"> |
97 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
98 | </Compile> | 101 | </Compile> |
@@ -102,9 +105,6 @@ | |||
102 | <Compile Include="UUIDPrimQuery.cs"> | 105 | <Compile Include="UUIDPrimQuery.cs"> |
103 | <SubType>Code</SubType> | 106 | <SubType>Code</SubType> |
104 | </Compile> | 107 | </Compile> |
105 | <Compile Include="Db4LocalStorage.cs"> | ||
106 | <SubType>Code</SubType> | ||
107 | </Compile> | ||
108 | </ItemGroup> | 108 | </ItemGroup> |
109 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 109 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
110 | <PropertyGroup> | 110 | <PropertyGroup> |
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build index 112ff1c..fc9f055 100644 --- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build +++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build | |||
@@ -12,10 +12,10 @@ | |||
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="Db4LocalStorage.cs" /> | ||
15 | <include name="MapStorage.cs" /> | 16 | <include name="MapStorage.cs" /> |
16 | <include name="UUIDParcelQuery.cs" /> | 17 | <include name="UUIDParcelQuery.cs" /> |
17 | <include name="UUIDPrimQuery.cs" /> | 18 | <include name="UUIDPrimQuery.cs" /> |
18 | <include name="Db4LocalStorage.cs" /> | ||
19 | </sources> | 19 | </sources> |
20 | <references basedir="${project::get-base-directory()}"> | 20 | <references basedir="${project::get-base-directory()}"> |
21 | <lib> | 21 | <lib> |