diff options
-rw-r--r-- | Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj | 114 | ||||
-rw-r--r-- | Common/OpenSim.Framework/OpenSim.Framework.csproj | 74 | ||||
-rw-r--r-- | OpenGridServices.sln | 125 | ||||
-rw-r--r-- | OpenGridServices/ServiceManager/ServiceManager.csproj | 33 | ||||
-rw-r--r-- | OpenSim.sln | 22 | ||||
-rw-r--r-- | OpenSim.suo | bin | 331264 -> 375744 bytes | |||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj | 12 | ||||
-rw-r--r-- | OpenSim/OpenSim.RegionServer/RegionInfo.cs | 147 | ||||
-rw-r--r-- | OpenSim/OpenSim.World/OpenSim.World.csproj | 10 | ||||
-rw-r--r-- | OpenSim/OpenSim.World/Primitive2.cs | 491 | ||||
-rw-r--r-- | OpenSim/OpenSim/OpenSim.csproj | 71 | ||||
-rw-r--r-- | bin/XMLRPC.dll | bin | 36864 -> 36864 bytes | |||
-rw-r--r-- | prebuild.xml | 29 |
13 files changed, 288 insertions, 840 deletions
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj index 836ab7e..00b1548 100644 --- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj +++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj | |||
@@ -1,58 +1,100 @@ | |||
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 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 3 | <ProjectType>Local</ProjectType> |
4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
5 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
6 | <SchemaVersion>2.0</SchemaVersion> | 5 | <SchemaVersion>2.0</SchemaVersion> |
7 | <ProjectGuid>{C9702041-922C-452A-A1B4-7880AF53149A}</ProjectGuid> | 6 | <ProjectGuid>{683344D5-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
9 | <ApplicationIcon></ApplicationIcon> | ||
10 | <AssemblyKeyContainerName> | ||
11 | </AssemblyKeyContainerName> | ||
12 | <AssemblyName>OpenGrid.Framework.Communications</AssemblyName> | ||
13 | <DefaultClientScript>JScript</DefaultClientScript> | ||
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | ||
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | ||
16 | <DelaySign>false</DelaySign> | ||
8 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
9 | <AppDesignerFolder>Properties</AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
10 | <RootNamespace>OpenGrid.Framework.Communications</RootNamespace> | 19 | <RootNamespace>OpenGrid.Framework.Communications</RootNamespace> |
11 | <AssemblyName>OpenGrid.Framework.Communications</AssemblyName> | 20 | <StartupObject></StartupObject> |
21 | <FileUpgradeFlags> | ||
22 | </FileUpgradeFlags> | ||
12 | </PropertyGroup> | 23 | </PropertyGroup> |
13 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 24 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
14 | <DebugSymbols>true</DebugSymbols> | 25 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
15 | <DebugType>full</DebugType> | 26 | <BaseAddress>285212672</BaseAddress> |
16 | <Optimize>false</Optimize> | 27 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
17 | <OutputPath>bin\Debug\</OutputPath> | 28 | <ConfigurationOverrideFile> |
18 | <DefineConstants>DEBUG;TRACE</DefineConstants> | 29 | </ConfigurationOverrideFile> |
19 | <ErrorReport>prompt</ErrorReport> | 30 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
31 | <DocumentationFile></DocumentationFile> | ||
32 | <DebugSymbols>True</DebugSymbols> | ||
33 | <FileAlignment>4096</FileAlignment> | ||
34 | <Optimize>False</Optimize> | ||
35 | <OutputPath>..\..\bin\</OutputPath> | ||
36 | <RegisterForComInterop>False</RegisterForComInterop> | ||
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | ||
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | ||
20 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
40 | <NoWarn></NoWarn> | ||
21 | </PropertyGroup> | 41 | </PropertyGroup> |
22 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
23 | <DebugType>pdbonly</DebugType> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
24 | <Optimize>true</Optimize> | 44 | <BaseAddress>285212672</BaseAddress> |
25 | <OutputPath>bin\Release\</OutputPath> | 45 | <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> |
46 | <ConfigurationOverrideFile> | ||
47 | </ConfigurationOverrideFile> | ||
26 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE</DefineConstants> |
27 | <ErrorReport>prompt</ErrorReport> | 49 | <DocumentationFile></DocumentationFile> |
50 | <DebugSymbols>False</DebugSymbols> | ||
51 | <FileAlignment>4096</FileAlignment> | ||
52 | <Optimize>True</Optimize> | ||
53 | <OutputPath>..\..\bin\</OutputPath> | ||
54 | <RegisterForComInterop>False</RegisterForComInterop> | ||
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | ||
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | ||
28 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
58 | <NoWarn></NoWarn> | ||
29 | </PropertyGroup> | 59 | </PropertyGroup> |
30 | <ItemGroup> | 60 | <ItemGroup> |
31 | <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL"> | 61 | <Reference Include="System" > |
32 | <SpecificVersion>False</SpecificVersion> | 62 | <HintPath>System.dll</HintPath> |
63 | <Private>False</Private> | ||
64 | </Reference> | ||
65 | <Reference Include="System.Xml" > | ||
66 | <HintPath>System.Xml.dll</HintPath> | ||
67 | <Private>False</Private> | ||
68 | </Reference> | ||
69 | <Reference Include="libsecondlife.dll" > | ||
33 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | 70 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
71 | <Private>False</Private> | ||
34 | </Reference> | 72 | </Reference> |
35 | <Reference Include="System" /> | ||
36 | <Reference Include="System.Data" /> | ||
37 | <Reference Include="System.Xml" /> | ||
38 | </ItemGroup> | ||
39 | <ItemGroup> | ||
40 | <Compile Include="RegionServerCommsManager.cs" /> | ||
41 | <Compile Include="Properties\AssemblyInfo.cs" /> | ||
42 | <Compile Include="TestLocalCommsManager.cs" /> | ||
43 | </ItemGroup> | 73 | </ItemGroup> |
44 | <ItemGroup> | 74 | <ItemGroup> |
45 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> | 75 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> |
46 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | ||
47 | <Name>OpenSim.Framework</Name> | 76 | <Name>OpenSim.Framework</Name> |
77 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | ||
78 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
79 | <Private>False</Private> | ||
48 | </ProjectReference> | 80 | </ProjectReference> |
49 | </ItemGroup> | 81 | </ItemGroup> |
50 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | 82 | <ItemGroup> |
51 | <!-- To modify your build process, add your task inside one of the targets below and uncomment it. | 83 | <Compile Include="RegionServerCommsManager.cs"> |
52 | Other similar extension points exist, see Microsoft.Common.targets. | 84 | <SubType>Code</SubType> |
53 | <Target Name="BeforeBuild"> | 85 | </Compile> |
54 | </Target> | 86 | <Compile Include="TestLocalCommsManager.cs"> |
55 | <Target Name="AfterBuild"> | 87 | <SubType>Code</SubType> |
56 | </Target> | 88 | </Compile> |
57 | --> | 89 | <Compile Include="Properties\AssemblyInfo.cs"> |
58 | </Project> \ No newline at end of file | 90 | <SubType>Code</SubType> |
91 | </Compile> | ||
92 | </ItemGroup> | ||
93 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | ||
94 | <PropertyGroup> | ||
95 | <PreBuildEvent> | ||
96 | </PreBuildEvent> | ||
97 | <PostBuildEvent> | ||
98 | </PostBuildEvent> | ||
99 | </PropertyGroup> | ||
100 | </Project> | ||
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj index be17a23..e2a850f 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,60 +55,68 @@ | |||
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.Data" /> | 65 | <Reference Include="System.Xml" > |
73 | <Reference Include="System.Xml"> | ||
74 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.dll</HintPath> |
75 | <Private>False</Private> | 67 | <Private>False</Private> |
76 | </Reference> | 68 | </Reference> |
77 | <Reference Include="libsecondlife.dll"> | 69 | <Reference Include="libsecondlife.dll" > |
78 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | 70 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
79 | <Private>False</Private> | 71 | <Private>False</Private> |
80 | </Reference> | 72 | </Reference> |
81 | <Reference Include="Db4objects.Db4o.dll"> | 73 | <Reference Include="Db4objects.Db4o.dll" > |
82 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> | 74 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> |
83 | <Private>False</Private> | 75 | <Private>False</Private> |
84 | </Reference> | 76 | </Reference> |
85 | </ItemGroup> | 77 | </ItemGroup> |
86 | <ItemGroup> | 78 | <ItemGroup> |
87 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | ||
88 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | ||
89 | <Name>OpenSim.Framework.Console</Name> | ||
90 | </ProjectReference> | ||
91 | <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj"> | 79 | <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj"> |
92 | <Name>XMLRPC</Name> | 80 | <Name>XMLRPC</Name> |
93 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | 81 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> |
94 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 82 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
95 | <Private>False</Private> | 83 | <Private>False</Private> |
84 | </ProjectReference> | ||
85 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | ||
86 | <Name>OpenSim.Framework.Console</Name> | ||
87 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | ||
88 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
89 | <Private>False</Private> | ||
96 | </ProjectReference> | 90 | </ProjectReference> |
97 | </ItemGroup> | 91 | </ItemGroup> |
98 | <ItemGroup> | 92 | <ItemGroup> |
99 | <Compile Include="AgentInventory.cs"> | 93 | <Compile Include="AgentInventory.cs"> |
100 | <SubType>Code</SubType> | 94 | <SubType>Code</SubType> |
101 | </Compile> | 95 | </Compile> |
102 | <Compile Include="AuthenticateSessionBase.cs" /> | 96 | <Compile Include="AuthenticateSessionBase.cs"> |
97 | <SubType>Code</SubType> | ||
98 | </Compile> | ||
103 | <Compile Include="BlockingQueue.cs"> | 99 | <Compile Include="BlockingQueue.cs"> |
104 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
105 | </Compile> | 101 | </Compile> |
106 | <Compile Include="IRegionCommsHost.cs" /> | 102 | <Compile Include="IRegionCommsHost.cs"> |
103 | <SubType>Code</SubType> | ||
104 | </Compile> | ||
107 | <Compile Include="LoginService.cs"> | 105 | <Compile Include="LoginService.cs"> |
108 | <SubType>Code</SubType> | 106 | <SubType>Code</SubType> |
109 | </Compile> | 107 | </Compile> |
110 | <Compile Include="RegionCommsHostBase.cs" /> | 108 | <Compile Include="RegionCommsHostBase.cs"> |
109 | <SubType>Code</SubType> | ||
110 | </Compile> | ||
111 | <Compile Include="Remoting.cs"> | 111 | <Compile Include="Remoting.cs"> |
112 | <SubType>Code</SubType> | 112 | <SubType>Code</SubType> |
113 | </Compile> | 113 | </Compile> |
114 | <Compile Include="SimProfile.cs" /> | 114 | <Compile Include="SimProfile.cs"> |
115 | <Compile Include="SimProfileBase.cs" /> | 115 | <SubType>Code</SubType> |
116 | <Compile Include="Types\AgentWearable.cs" /> | 116 | </Compile> |
117 | <Compile Include="Types\NetworkServersInfo.cs" /> | 117 | <Compile Include="SimProfileBase.cs"> |
118 | <SubType>Code</SubType> | ||
119 | </Compile> | ||
118 | <Compile Include="UserProfile.cs"> | 120 | <Compile Include="UserProfile.cs"> |
119 | <SubType>Code</SubType> | 121 | <SubType>Code</SubType> |
120 | </Compile> | 122 | </Compile> |
@@ -190,6 +192,9 @@ | |||
190 | <Compile Include="Types\AgentCiruitData.cs"> | 192 | <Compile Include="Types\AgentCiruitData.cs"> |
191 | <SubType>Code</SubType> | 193 | <SubType>Code</SubType> |
192 | </Compile> | 194 | </Compile> |
195 | <Compile Include="Types\AgentWearable.cs"> | ||
196 | <SubType>Code</SubType> | ||
197 | </Compile> | ||
193 | <Compile Include="Types\AssetBase.cs"> | 198 | <Compile Include="Types\AssetBase.cs"> |
194 | <SubType>Code</SubType> | 199 | <SubType>Code</SubType> |
195 | </Compile> | 200 | </Compile> |
@@ -205,6 +210,9 @@ | |||
205 | <Compile Include="Types\NeighbourInfo.cs"> | 210 | <Compile Include="Types\NeighbourInfo.cs"> |
206 | <SubType>Code</SubType> | 211 | <SubType>Code</SubType> |
207 | </Compile> | 212 | </Compile> |
213 | <Compile Include="Types\NetworkServersInfo.cs"> | ||
214 | <SubType>Code</SubType> | ||
215 | </Compile> | ||
208 | <Compile Include="Types\OSVector3.cs"> | 216 | <Compile Include="Types\OSVector3.cs"> |
209 | <SubType>Code</SubType> | 217 | <SubType>Code</SubType> |
210 | </Compile> | 218 | </Compile> |
@@ -222,4 +230,4 @@ | |||
222 | <PostBuildEvent> | 230 | <PostBuildEvent> |
223 | </PostBuildEvent> | 231 | </PostBuildEvent> |
224 | </PropertyGroup> | 232 | </PropertyGroup> |
225 | </Project> \ No newline at end of file | 233 | </Project> |
diff --git a/OpenGridServices.sln b/OpenGridServices.sln index bc21256..641f710 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}" |
@@ -25,61 +25,70 @@ EndProject | |||
25 | 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}" | 25 | 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}" |
26 | EndProject | 26 | EndProject |
27 | Global | 27 | Global |
28 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 28 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
29 | Debug|Any CPU = Debug|Any CPU | 29 | Debug|Any CPU = Debug|Any CPU |
30 | Release|Any CPU = Release|Any CPU | 30 | Release|Any CPU = Release|Any CPU |
31 | EndGlobalSection | 31 | EndGlobalSection |
32 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | 32 | GlobalSection(ProjectDependencies) = postSolution |
33 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 33 | ({1E3F341A-0000-0000-0000-000000000000}).4 = ({62CDF671-0000-0000-0000-000000000000}) |
34 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 34 | ({39BD9497-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000}) |
35 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 35 | ({21BFC8E2-0000-0000-0000-000000000000}).6 = ({62CDF671-0000-0000-0000-000000000000}) |
36 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 36 | ({21BFC8E2-0000-0000-0000-000000000000}).7 = ({7924FD35-0000-0000-0000-000000000000}) |
37 | {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 37 | ({0A563AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000}) |
38 | {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 38 | ({66591469-0000-0000-0000-000000000000}).5 = ({62CDF671-0000-0000-0000-000000000000}) |
39 | {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 39 | ({0F3C3AC1-0000-0000-0000-000000000000}).3 = ({62CDF671-0000-0000-0000-000000000000}) |
40 | {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 40 | EndGlobalSection |
41 | {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 41 | GlobalSection(ProjectConfigurationPlatforms) = postSolution |
42 | {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 42 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
43 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 43 | {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
44 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 44 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
45 | {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 45 | {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
46 | {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 46 | {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
47 | {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 47 | {0021261B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
48 | {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 48 | {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
49 | {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 49 | {0021261B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
50 | {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 50 | {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
51 | {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 51 | {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
52 | {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 52 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
53 | {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 53 | {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
54 | {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 54 | {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
55 | {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 55 | {1E3F341A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
56 | {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 56 | {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
57 | {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 57 | {1E3F341A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
58 | {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 58 | {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
59 | {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 59 | {39BD9497-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
60 | {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 60 | {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
61 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 61 | {39BD9497-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
62 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 62 | {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
63 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 63 | {E141F4EE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
64 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 64 | {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
65 | {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 65 | {E141F4EE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
66 | {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 66 | {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
67 | {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 67 | {7924FD35-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
68 | {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 68 | {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
69 | {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 69 | {7924FD35-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
70 | {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 70 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
71 | {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 71 | {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
72 | {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 72 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
73 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 73 | {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
74 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 74 | {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
75 | {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 75 | {0A563AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
76 | {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 76 | {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
77 | {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 77 | {0A563AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
78 | {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 78 | {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
79 | {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 79 | {62CDF671-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
80 | {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 80 | {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
81 | EndGlobalSection | 81 | {62CDF671-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
82 | GlobalSection(SolutionProperties) = preSolution | 82 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
83 | HideSolutionNode = FALSE | 83 | {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
84 | EndGlobalSection | 84 | {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
85 | {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
86 | {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
87 | {0F3C3AC1-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
88 | {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
89 | {0F3C3AC1-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
90 | EndGlobalSection | ||
91 | GlobalSection(SolutionProperties) = preSolution | ||
92 | HideSolutionNode = FALSE | ||
93 | EndGlobalSection | ||
85 | EndGlobal | 94 | EndGlobal |
diff --git a/OpenGridServices/ServiceManager/ServiceManager.csproj b/OpenGridServices/ServiceManager/ServiceManager.csproj index 392f560..54d31b2 100644 --- a/OpenGridServices/ServiceManager/ServiceManager.csproj +++ b/OpenGridServices/ServiceManager/ServiceManager.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>{E141F4EE-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{E141F4EE-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>ServiceManager</AssemblyName> | 12 | <AssemblyName>ServiceManager</AssemblyName> |
@@ -16,11 +15,9 @@ | |||
16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
17 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
18 | <OutputType>Exe</OutputType> | 17 | <OutputType>Exe</OutputType> |
19 | <AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
20 | </AppDesignerFolder> | ||
21 | <RootNamespace>ServiceManager</RootNamespace> | 19 | <RootNamespace>ServiceManager</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.ServiceProcess"> | 65 | <Reference Include="System.ServiceProcess" > |
73 | <HintPath>System.ServiceProcess.dll</HintPath> | 66 | <HintPath>System.ServiceProcess.dll</HintPath> |
74 | <Private>False</Private> | 67 | <Private>False</Private> |
75 | </Reference> | 68 | </Reference> |
76 | <Reference Include="System.Xml"> | 69 | <Reference Include="System.Xml" > |
77 | <HintPath>System.Xml.dll</HintPath> | 70 | <HintPath>System.Xml.dll</HintPath> |
78 | <Private>False</Private> | 71 | <Private>False</Private> |
79 | </Reference> | 72 | </Reference> |
@@ -82,7 +75,7 @@ | |||
82 | </ItemGroup> | 75 | </ItemGroup> |
83 | <ItemGroup> | 76 | <ItemGroup> |
84 | <Compile Include="ServiceManager.cs"> | 77 | <Compile Include="ServiceManager.cs"> |
85 | <SubType>Component</SubType> | 78 | <SubType>Code</SubType> |
86 | </Compile> | 79 | </Compile> |
87 | </ItemGroup> | 80 | </ItemGroup> |
88 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | 81 | <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> |
@@ -92,4 +85,4 @@ | |||
92 | <PostBuildEvent> | 85 | <PostBuildEvent> |
93 | </PostBuildEvent> | 86 | </PostBuildEvent> |
94 | </PropertyGroup> | 87 | </PropertyGroup> |
95 | </Project> \ No newline at end of file | 88 | </Project> |
diff --git a/OpenSim.sln b/OpenSim.sln index 2a00e9f..d2036f0 100644 --- a/OpenSim.sln +++ b/OpenSim.sln | |||
@@ -1,12 +1,14 @@ | |||
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 C# Express 2005 |
3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}" | ||
4 | EndProject | ||
3 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" | 5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}" |
4 | EndProject | 6 | EndProject |
5 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim\OpenSim.Storage\LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}" | 7 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Storage.LocalStorageBerkeleyDB", "OpenSim\OpenSim.Storage\LocalStorageBerkeleyDB\OpenSim.Storage.LocalStorageBerkeleyDB.csproj", "{EE9E5D96-0000-0000-0000-000000000000}" |
6 | EndProject | 8 | EndProject |
7 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim\OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{63A05FE9-0000-0000-0000-000000000000}" | 9 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Physics.OdePlugin", "OpenSim\OpenSim.Physics\OdePlugin\OpenSim.Physics.OdePlugin.csproj", "{63A05FE9-0000-0000-0000-000000000000}" |
8 | EndProject | 10 | EndProject |
9 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Console", "Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj", "{A7CD0630-0000-0000-0000-000000000000}" | 11 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Communications", "Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj", "{683344D5-0000-0000-0000-000000000000}" |
10 | EndProject | 12 | EndProject |
11 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.World", "OpenSim\OpenSim.World\OpenSim.World.csproj", "{642A14A8-0000-0000-0000-000000000000}" | 13 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.World", "OpenSim\OpenSim.World\OpenSim.World.csproj", "{642A14A8-0000-0000-0000-000000000000}" |
12 | EndProject | 14 | EndProject |
@@ -38,14 +40,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.GridInterfaces.Loca | |||
38 | EndProject | 40 | EndProject |
39 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" | 41 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLRPC", "Common\XmlRpcCS\XMLRPC.csproj", "{8E81D43C-0000-0000-0000-000000000000}" |
40 | EndProject | 42 | EndProject |
41 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework.Communications", "Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj", "{C9702041-922C-452A-A1B4-7880AF53149A}" | ||
42 | EndProject | ||
43 | Global | 43 | Global |
44 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 44 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
45 | Debug|Any CPU = Debug|Any CPU | 45 | Debug|Any CPU = Debug|Any CPU |
46 | Release|Any CPU = Release|Any CPU | 46 | Release|Any CPU = Release|Any CPU |
47 | EndGlobalSection | 47 | EndGlobalSection |
48 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | 48 | GlobalSection(ProjectConfigurationPlatforms) = postSolution |
49 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
50 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
51 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
52 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | ||
49 | {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 53 | {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
50 | {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 54 | {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
51 | {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 55 | {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
@@ -58,10 +62,10 @@ Global | |||
58 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 62 | {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
59 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 63 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
60 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 64 | {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
61 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 65 | {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
62 | {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 66 | {683344D5-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
63 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 67 | {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
64 | {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 68 | {683344D5-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
65 | {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | 69 | {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
66 | {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 70 | {642A14A8-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
67 | {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 71 | {642A14A8-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
@@ -122,10 +126,6 @@ Global | |||
122 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU | 126 | {8E81D43C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU |
123 | {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU | 127 | {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU |
124 | {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU | 128 | {8E81D43C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU |
125 | {C9702041-922C-452A-A1B4-7880AF53149A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
126 | {C9702041-922C-452A-A1B4-7880AF53149A}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
127 | {C9702041-922C-452A-A1B4-7880AF53149A}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
128 | {C9702041-922C-452A-A1B4-7880AF53149A}.Release|Any CPU.Build.0 = Release|Any CPU | ||
129 | EndGlobalSection | 129 | EndGlobalSection |
130 | GlobalSection(SolutionProperties) = preSolution | 130 | GlobalSection(SolutionProperties) = preSolution |
131 | HideSolutionNode = FALSE | 131 | HideSolutionNode = FALSE |
diff --git a/OpenSim.suo b/OpenSim.suo index a676210..60e93fd 100644 --- a/OpenSim.suo +++ b/OpenSim.suo | |||
Binary files differ | |||
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 2c61026..b7cea3a 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj | |||
@@ -69,7 +69,6 @@ | |||
69 | <HintPath>System.dll</HintPath> | 69 | <HintPath>System.dll</HintPath> |
70 | <Private>False</Private> | 70 | <Private>False</Private> |
71 | </Reference> | 71 | </Reference> |
72 | <Reference Include="System.Data" /> | ||
73 | <Reference Include="System.Xml"> | 72 | <Reference Include="System.Xml"> |
74 | <HintPath>System.Xml.dll</HintPath> | 73 | <HintPath>System.Xml.dll</HintPath> |
75 | <Private>False</Private> | 74 | <Private>False</Private> |
@@ -162,7 +161,12 @@ | |||
162 | <Compile Include="CommsManager.cs"> | 161 | <Compile Include="CommsManager.cs"> |
163 | <SubType>Code</SubType> | 162 | <SubType>Code</SubType> |
164 | </Compile> | 163 | </Compile> |
165 | <Compile Include="OpenSimNetworkHandler.cs" /> | 164 | <Compile Include="NetworkServersInfo.cs"> |
165 | <SubType>Code</SubType> | ||
166 | </Compile> | ||
167 | <Compile Include="OpenSimNetworkHandler.cs"> | ||
168 | <SubType>Code</SubType> | ||
169 | </Compile> | ||
166 | <Compile Include="PacketServer.cs"> | 170 | <Compile Include="PacketServer.cs"> |
167 | <SubType>Code</SubType> | 171 | <SubType>Code</SubType> |
168 | </Compile> | 172 | </Compile> |
@@ -172,7 +176,9 @@ | |||
172 | <Compile Include="UDPServer.cs"> | 176 | <Compile Include="UDPServer.cs"> |
173 | <SubType>Code</SubType> | 177 | <SubType>Code</SubType> |
174 | </Compile> | 178 | </Compile> |
175 | <Compile Include="UserConfigUtility.cs" /> | 179 | <Compile Include="UserConfigUtility.cs"> |
180 | <SubType>Code</SubType> | ||
181 | </Compile> | ||
176 | <Compile Include="VersionInfo.cs"> | 182 | <Compile Include="VersionInfo.cs"> |
177 | <SubType>Code</SubType> | 183 | <SubType>Code</SubType> |
178 | </Compile> | 184 | </Compile> |
diff --git a/OpenSim/OpenSim.RegionServer/RegionInfo.cs b/OpenSim/OpenSim.RegionServer/RegionInfo.cs deleted file mode 100644 index d148d0f..0000000 --- a/OpenSim/OpenSim.RegionServer/RegionInfo.cs +++ /dev/null | |||
@@ -1,147 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using System.Net; | ||
5 | using System.Web; | ||
6 | using System.IO; | ||
7 | using OpenSim.Framework.Interfaces; | ||
8 | using OpenSim.Framework.Utilities; | ||
9 | using libsecondlife; | ||
10 | using OpenSim.Framework.Types; | ||
11 | |||
12 | namespace OpenSim | ||
13 | { | ||
14 | public class RegionInfo : RegionInfoBase | ||
15 | { | ||
16 | |||
17 | private bool isSandbox; | ||
18 | |||
19 | public string DataStore; | ||
20 | |||
21 | public RegionInfo() | ||
22 | { | ||
23 | |||
24 | } | ||
25 | |||
26 | public void InitConfig(bool sandboxMode, IGenericConfig configData) | ||
27 | { | ||
28 | this.isSandbox = sandboxMode; | ||
29 | try | ||
30 | { | ||
31 | // Sim UUID | ||
32 | string attri = ""; | ||
33 | attri = configData.GetAttribute("SimUUID"); | ||
34 | if (attri == "") | ||
35 | { | ||
36 | this.SimUUID = LLUUID.Random(); | ||
37 | configData.SetAttribute("SimUUID", this.SimUUID.ToString()); | ||
38 | } | ||
39 | else | ||
40 | { | ||
41 | this.SimUUID = new LLUUID(attri); | ||
42 | } | ||
43 | |||
44 | // Sim name | ||
45 | attri = ""; | ||
46 | attri = configData.GetAttribute("SimName"); | ||
47 | if (attri == "") | ||
48 | { | ||
49 | this.RegionName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Name", "OpenSim test"); | ||
50 | configData.SetAttribute("SimName", this.RegionName); | ||
51 | } | ||
52 | else | ||
53 | { | ||
54 | this.RegionName = attri; | ||
55 | } | ||
56 | // Sim/Grid location X | ||
57 | attri = ""; | ||
58 | attri = configData.GetAttribute("SimLocationX"); | ||
59 | if (attri == "") | ||
60 | { | ||
61 | string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location X", "997"); | ||
62 | configData.SetAttribute("SimLocationX", location); | ||
63 | this.RegionLocX = (uint)Convert.ToUInt32(location); | ||
64 | } | ||
65 | else | ||
66 | { | ||
67 | this.RegionLocX = (uint)Convert.ToUInt32(attri); | ||
68 | } | ||
69 | // Sim/Grid location Y | ||
70 | attri = ""; | ||
71 | attri = configData.GetAttribute("SimLocationY"); | ||
72 | if (attri == "") | ||
73 | { | ||
74 | string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location Y", "996"); | ||
75 | configData.SetAttribute("SimLocationY", location); | ||
76 | this.RegionLocY = (uint)Convert.ToUInt32(location); | ||
77 | } | ||
78 | else | ||
79 | { | ||
80 | this.RegionLocY = (uint)Convert.ToUInt32(attri); | ||
81 | } | ||
82 | |||
83 | // Local storage datastore | ||
84 | attri = ""; | ||
85 | attri = configData.GetAttribute("Datastore"); | ||
86 | if (attri == "") | ||
87 | { | ||
88 | string datastore = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Filename for local storage", "localworld.yap"); | ||
89 | configData.SetAttribute("Datastore", datastore); | ||
90 | this.DataStore = datastore; | ||
91 | } | ||
92 | else | ||
93 | { | ||
94 | this.DataStore = attri; | ||
95 | } | ||
96 | |||
97 | //Sim Listen Port | ||
98 | attri = ""; | ||
99 | attri = configData.GetAttribute("SimListenPort"); | ||
100 | if (attri == "") | ||
101 | { | ||
102 | string port = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("UDP port for client connections", "9000"); | ||
103 | configData.SetAttribute("SimListenPort", port); | ||
104 | this.IPListenPort = Convert.ToInt32(port); | ||
105 | } | ||
106 | else | ||
107 | { | ||
108 | this.IPListenPort = Convert.ToInt32(attri); | ||
109 | } | ||
110 | //Sim Listen Address | ||
111 | attri = ""; | ||
112 | attri = configData.GetAttribute("SimListenAddress"); | ||
113 | if (attri == "") | ||
114 | { | ||
115 | this.IPListenAddr = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("IP Address to listen on for client connections", "127.0.0.1"); | ||
116 | configData.SetAttribute("SimListenAddress", this.IPListenAddr); | ||
117 | } | ||
118 | else | ||
119 | { | ||
120 | this.IPListenAddr = attri; | ||
121 | } | ||
122 | |||
123 | |||
124 | this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256)); | ||
125 | |||
126 | configData.Commit(); | ||
127 | } | ||
128 | catch (Exception e) | ||
129 | { | ||
130 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Config.cs:InitConfig() - Exception occured"); | ||
131 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString()); | ||
132 | } | ||
133 | |||
134 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Sim settings loaded:"); | ||
135 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "UUID: " + this.SimUUID.ToStringHyphenated()); | ||
136 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Name: " + this.RegionName); | ||
137 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]"); | ||
138 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Handle: " + this.RegionHandle.ToString()); | ||
139 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort); | ||
140 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Sandbox Mode? " + isSandbox.ToString()); | ||
141 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Asset URL: " + this.AssetURL); | ||
142 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Asset key: " + this.AssetSendKey); | ||
143 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Grid URL: " + this.GridURL); | ||
144 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Grid key: " + this.GridSendKey); | ||
145 | } | ||
146 | } | ||
147 | } | ||
diff --git a/OpenSim/OpenSim.World/OpenSim.World.csproj b/OpenSim/OpenSim.World/OpenSim.World.csproj index 78025d3..6cda518 100644 --- a/OpenSim/OpenSim.World/OpenSim.World.csproj +++ b/OpenSim/OpenSim.World/OpenSim.World.csproj | |||
@@ -87,10 +87,6 @@ | |||
87 | </Reference> | 87 | </Reference> |
88 | </ItemGroup> | 88 | </ItemGroup> |
89 | <ItemGroup> | 89 | <ItemGroup> |
90 | <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj"> | ||
91 | <Project>{C9702041-922C-452A-A1B4-7880AF53149A}</Project> | ||
92 | <Name>OpenGrid.Framework.Communications</Name> | ||
93 | </ProjectReference> | ||
94 | <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj"> | 90 | <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj"> |
95 | <Name>OpenSim.Terrain.BasicTerrain</Name> | 91 | <Name>OpenSim.Terrain.BasicTerrain</Name> |
96 | <Project>{2270B8FE-0000-0000-0000-000000000000}</Project> | 92 | <Project>{2270B8FE-0000-0000-0000-000000000000}</Project> |
@@ -133,6 +129,12 @@ | |||
133 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 129 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
134 | <Private>False</Private> | 130 | <Private>False</Private> |
135 | </ProjectReference> | 131 | </ProjectReference> |
132 | <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj"> | ||
133 | <Name>OpenGrid.Framework.Communications</Name> | ||
134 | <Project>{683344D5-0000-0000-0000-000000000000}</Project> | ||
135 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
136 | <Private>False</Private> | ||
137 | </ProjectReference> | ||
136 | </ItemGroup> | 138 | </ItemGroup> |
137 | <ItemGroup> | 139 | <ItemGroup> |
138 | <Compile Include="Avatar.Client.cs"> | 140 | <Compile Include="Avatar.Client.cs"> |
diff --git a/OpenSim/OpenSim.World/Primitive2.cs b/OpenSim/OpenSim.World/Primitive2.cs deleted file mode 100644 index 6d071d4..0000000 --- a/OpenSim/OpenSim.World/Primitive2.cs +++ /dev/null | |||
@@ -1,491 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using OpenSim.types; | ||
5 | using libsecondlife; | ||
6 | using libsecondlife.Packets; | ||
7 | using OpenSim.Framework.Interfaces; | ||
8 | using OpenSim.Physics.Manager; | ||
9 | using OpenSim.Framework.Types; | ||
10 | using OpenSim.Framework.Inventory; | ||
11 | |||
12 | namespace OpenSim.world | ||
13 | { | ||
14 | public class Primitive2 : Entity | ||
15 | { | ||
16 | protected PrimData primData; | ||
17 | //private ObjectUpdatePacket OurPacket; | ||
18 | private LLVector3 positionLastFrame = new LLVector3(0, 0, 0); | ||
19 | private Dictionary<uint, ClientView> m_clientThreads; | ||
20 | private ulong m_regionHandle; | ||
21 | private const uint FULL_MASK_PERMISSIONS = 2147483647; | ||
22 | private bool physicsEnabled = false; | ||
23 | |||
24 | private Dictionary<LLUUID, InventoryItem> inventoryItems; | ||
25 | |||
26 | #region Properties | ||
27 | |||
28 | public LLVector3 Scale | ||
29 | { | ||
30 | set | ||
31 | { | ||
32 | this.primData.Scale = value; | ||
33 | //this.dirtyFlag = true; | ||
34 | } | ||
35 | get | ||
36 | { | ||
37 | return this.primData.Scale; | ||
38 | } | ||
39 | } | ||
40 | |||
41 | public PhysicsActor PhysActor | ||
42 | { | ||
43 | set | ||
44 | { | ||
45 | this._physActor = value; | ||
46 | } | ||
47 | } | ||
48 | public override LLVector3 Pos | ||
49 | { | ||
50 | get | ||
51 | { | ||
52 | return base.Pos; | ||
53 | } | ||
54 | set | ||
55 | { | ||
56 | base.Pos = value; | ||
57 | } | ||
58 | } | ||
59 | #endregion | ||
60 | |||
61 | public Primitive2(Dictionary<uint, ClientView> clientThreads, ulong regionHandle, World world) | ||
62 | { | ||
63 | m_clientThreads = clientThreads; | ||
64 | m_regionHandle = regionHandle; | ||
65 | m_world = world; | ||
66 | inventoryItems = new Dictionary<LLUUID, InventoryItem>(); | ||
67 | } | ||
68 | |||
69 | public Primitive2(Dictionary<uint, ClientView> clientThreads, ulong regionHandle, World world, LLUUID owner) | ||
70 | { | ||
71 | m_clientThreads = clientThreads; | ||
72 | m_regionHandle = regionHandle; | ||
73 | m_world = world; | ||
74 | inventoryItems = new Dictionary<LLUUID, InventoryItem>(); | ||
75 | this.primData = new PrimData(); | ||
76 | this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; | ||
77 | this.primData.OwnerID = owner; | ||
78 | } | ||
79 | |||
80 | public byte[] GetByteArray() | ||
81 | { | ||
82 | byte[] result = null; | ||
83 | List<byte[]> dataArrays = new List<byte[]>(); | ||
84 | dataArrays.Add(primData.ToBytes()); | ||
85 | foreach (Entity child in children) | ||
86 | { | ||
87 | if (child is OpenSim.world.Primitive2) | ||
88 | { | ||
89 | dataArrays.Add(((OpenSim.world.Primitive2)child).GetByteArray()); | ||
90 | } | ||
91 | } | ||
92 | byte[] primstart = Helpers.StringToField("<Prim>"); | ||
93 | byte[] primend = Helpers.StringToField("</Prim>"); | ||
94 | int totalLength = primstart.Length + primend.Length; | ||
95 | for (int i = 0; i < dataArrays.Count; i++) | ||
96 | { | ||
97 | totalLength += dataArrays[i].Length; | ||
98 | } | ||
99 | |||
100 | result = new byte[totalLength]; | ||
101 | int arraypos = 0; | ||
102 | Array.Copy(primstart, 0, result, 0, primstart.Length); | ||
103 | arraypos += primstart.Length; | ||
104 | for (int i = 0; i < dataArrays.Count; i++) | ||
105 | { | ||
106 | Array.Copy(dataArrays[i], 0, result, arraypos, dataArrays[i].Length); | ||
107 | arraypos += dataArrays[i].Length; | ||
108 | } | ||
109 | Array.Copy(primend, 0, result, arraypos, primend.Length); | ||
110 | |||
111 | return result; | ||
112 | } | ||
113 | |||
114 | #region Overridden Methods | ||
115 | |||
116 | public override void update() | ||
117 | { | ||
118 | LLVector3 pos2 = new LLVector3(0, 0, 0); | ||
119 | } | ||
120 | |||
121 | public override void BackUp() | ||
122 | { | ||
123 | |||
124 | } | ||
125 | |||
126 | #endregion | ||
127 | |||
128 | #region Packet handlers | ||
129 | |||
130 | public void UpdatePosition(LLVector3 pos) | ||
131 | { | ||
132 | |||
133 | } | ||
134 | |||
135 | public void UpdateShape(ObjectShapePacket.ObjectDataBlock addPacket) | ||
136 | { | ||
137 | this.primData.PathBegin = addPacket.PathBegin; | ||
138 | this.primData.PathEnd = addPacket.PathEnd; | ||
139 | this.primData.PathScaleX = addPacket.PathScaleX; | ||
140 | this.primData.PathScaleY = addPacket.PathScaleY; | ||
141 | this.primData.PathShearX = addPacket.PathShearX; | ||
142 | this.primData.PathShearY = addPacket.PathShearY; | ||
143 | this.primData.PathSkew = addPacket.PathSkew; | ||
144 | this.primData.ProfileBegin = addPacket.ProfileBegin; | ||
145 | this.primData.ProfileEnd = addPacket.ProfileEnd; | ||
146 | this.primData.PathCurve = addPacket.PathCurve; | ||
147 | this.primData.ProfileCurve = addPacket.ProfileCurve; | ||
148 | this.primData.ProfileHollow = addPacket.ProfileHollow; | ||
149 | this.primData.PathRadiusOffset = addPacket.PathRadiusOffset; | ||
150 | this.primData.PathRevolutions = addPacket.PathRevolutions; | ||
151 | this.primData.PathTaperX = addPacket.PathTaperX; | ||
152 | this.primData.PathTaperY = addPacket.PathTaperY; | ||
153 | this.primData.PathTwist = addPacket.PathTwist; | ||
154 | this.primData.PathTwistBegin = addPacket.PathTwistBegin; | ||
155 | } | ||
156 | |||
157 | public void UpdateTexture(byte[] tex) | ||
158 | { | ||
159 | this.primData.Texture = tex; | ||
160 | //this.dirtyFlag = true; | ||
161 | } | ||
162 | |||
163 | public void UpdateObjectFlags(ObjectFlagUpdatePacket pack) | ||
164 | { | ||
165 | |||
166 | } | ||
167 | |||
168 | public void AssignToParent(Primitive prim) | ||
169 | { | ||
170 | |||
171 | } | ||
172 | |||
173 | public void GetProperites(ClientView client) | ||
174 | { | ||
175 | ObjectPropertiesPacket proper = new ObjectPropertiesPacket(); | ||
176 | proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1]; | ||
177 | proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock(); | ||
178 | proper.ObjectData[0].ItemID = LLUUID.Zero; | ||
179 | proper.ObjectData[0].CreationDate = (ulong)this.primData.CreationDate; | ||
180 | proper.ObjectData[0].CreatorID = this.primData.OwnerID; | ||
181 | proper.ObjectData[0].FolderID = LLUUID.Zero; | ||
182 | proper.ObjectData[0].FromTaskID = LLUUID.Zero; | ||
183 | proper.ObjectData[0].GroupID = LLUUID.Zero; | ||
184 | proper.ObjectData[0].InventorySerial = 0; | ||
185 | proper.ObjectData[0].LastOwnerID = LLUUID.Zero; | ||
186 | proper.ObjectData[0].ObjectID = this.uuid; | ||
187 | proper.ObjectData[0].OwnerID = primData.OwnerID; | ||
188 | proper.ObjectData[0].TouchName = new byte[0]; | ||
189 | proper.ObjectData[0].TextureID = new byte[0]; | ||
190 | proper.ObjectData[0].SitName = new byte[0]; | ||
191 | proper.ObjectData[0].Name = new byte[0]; | ||
192 | proper.ObjectData[0].Description = new byte[0]; | ||
193 | proper.ObjectData[0].OwnerMask = this.primData.OwnerMask; | ||
194 | proper.ObjectData[0].NextOwnerMask = this.primData.NextOwnerMask; | ||
195 | proper.ObjectData[0].GroupMask = this.primData.GroupMask; | ||
196 | proper.ObjectData[0].EveryoneMask = this.primData.EveryoneMask; | ||
197 | proper.ObjectData[0].BaseMask = this.primData.BaseMask; | ||
198 | |||
199 | client.OutPacket(proper); | ||
200 | } | ||
201 | |||
202 | #endregion | ||
203 | |||
204 | # region Inventory Methods | ||
205 | |||
206 | public bool AddToInventory(InventoryItem item) | ||
207 | { | ||
208 | return false; | ||
209 | } | ||
210 | |||
211 | public InventoryItem RemoveFromInventory(LLUUID itemID) | ||
212 | { | ||
213 | return null; | ||
214 | } | ||
215 | |||
216 | public void RequestInventoryInfo(ClientView simClient, RequestTaskInventoryPacket packet) | ||
217 | { | ||
218 | |||
219 | } | ||
220 | |||
221 | public void RequestXferInventory(ClientView simClient, ulong xferID) | ||
222 | { | ||
223 | //will only currently work if the total size of the inventory data array is under about 1000 bytes | ||
224 | SendXferPacketPacket send = new SendXferPacketPacket(); | ||
225 | |||
226 | send.XferID.ID = xferID; | ||
227 | send.XferID.Packet = 1 + 2147483648; | ||
228 | send.DataPacket.Data = this.ConvertInventoryToBytes(); | ||
229 | |||
230 | simClient.OutPacket(send); | ||
231 | } | ||
232 | |||
233 | public byte[] ConvertInventoryToBytes() | ||
234 | { | ||
235 | System.Text.Encoding enc = System.Text.Encoding.ASCII; | ||
236 | byte[] result = new byte[0]; | ||
237 | List<byte[]> inventoryData = new List<byte[]>(); | ||
238 | int totallength = 0; | ||
239 | foreach (InventoryItem invItem in inventoryItems.Values) | ||
240 | { | ||
241 | byte[] data = enc.GetBytes(invItem.ExportString()); | ||
242 | inventoryData.Add(data); | ||
243 | totallength += data.Length; | ||
244 | } | ||
245 | //TODO: copy arrays into the single result array | ||
246 | |||
247 | return result; | ||
248 | } | ||
249 | |||
250 | public void CreateInventoryFromBytes(byte[] data) | ||
251 | { | ||
252 | |||
253 | } | ||
254 | |||
255 | #endregion | ||
256 | |||
257 | #region Update viewers Methods | ||
258 | |||
259 | //should change these mehtods, so that outgoing packets are sent through the avatar class | ||
260 | public void SendFullUpdateToClient(ClientView remoteClient) | ||
261 | { | ||
262 | LLVector3 lPos; | ||
263 | if (this._physActor != null && this.physicsEnabled) | ||
264 | { | ||
265 | PhysicsVector pPos = this._physActor.Position; | ||
266 | lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z); | ||
267 | } | ||
268 | else | ||
269 | { | ||
270 | lPos = this.Pos; | ||
271 | } | ||
272 | |||
273 | ObjectUpdatePacket outPacket = new ObjectUpdatePacket(); | ||
274 | outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1]; | ||
275 | outPacket.ObjectData[0] = this.CreateUpdateBlock(); | ||
276 | byte[] pb = lPos.GetBytes(); | ||
277 | Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length); | ||
278 | |||
279 | remoteClient.OutPacket(outPacket); | ||
280 | } | ||
281 | |||
282 | public void SendFullUpdateToAllClients() | ||
283 | { | ||
284 | |||
285 | } | ||
286 | |||
287 | public void SendTerseUpdateToClient(ClientView RemoteClient) | ||
288 | { | ||
289 | |||
290 | } | ||
291 | |||
292 | public void SendTerseUpdateToALLClients() | ||
293 | { | ||
294 | |||
295 | } | ||
296 | |||
297 | #endregion | ||
298 | |||
299 | #region Create Methods | ||
300 | |||
301 | public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID ownerID, uint localID) | ||
302 | { | ||
303 | PrimData PData = new PrimData(); | ||
304 | this.primData = PData; | ||
305 | this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; | ||
306 | |||
307 | PData.OwnerID = ownerID; | ||
308 | PData.PCode = addPacket.ObjectData.PCode; | ||
309 | PData.PathBegin = addPacket.ObjectData.PathBegin; | ||
310 | PData.PathEnd = addPacket.ObjectData.PathEnd; | ||
311 | PData.PathScaleX = addPacket.ObjectData.PathScaleX; | ||
312 | PData.PathScaleY = addPacket.ObjectData.PathScaleY; | ||
313 | PData.PathShearX = addPacket.ObjectData.PathShearX; | ||
314 | PData.PathShearY = addPacket.ObjectData.PathShearY; | ||
315 | PData.PathSkew = addPacket.ObjectData.PathSkew; | ||
316 | PData.ProfileBegin = addPacket.ObjectData.ProfileBegin; | ||
317 | PData.ProfileEnd = addPacket.ObjectData.ProfileEnd; | ||
318 | PData.Scale = addPacket.ObjectData.Scale; | ||
319 | PData.PathCurve = addPacket.ObjectData.PathCurve; | ||
320 | PData.ProfileCurve = addPacket.ObjectData.ProfileCurve; | ||
321 | PData.ParentID = 0; | ||
322 | PData.ProfileHollow = addPacket.ObjectData.ProfileHollow; | ||
323 | PData.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset; | ||
324 | PData.PathRevolutions = addPacket.ObjectData.PathRevolutions; | ||
325 | PData.PathTaperX = addPacket.ObjectData.PathTaperX; | ||
326 | PData.PathTaperY = addPacket.ObjectData.PathTaperY; | ||
327 | PData.PathTwist = addPacket.ObjectData.PathTwist; | ||
328 | PData.PathTwistBegin = addPacket.ObjectData.PathTwistBegin; | ||
329 | LLVector3 pos1 = addPacket.ObjectData.RayEnd; | ||
330 | this.primData.FullID = this.uuid = LLUUID.Random(); | ||
331 | this.localid = (uint)(localID); | ||
332 | this.primData.Position = this.Pos = pos1; | ||
333 | } | ||
334 | |||
335 | public void CreateFromBytes(byte[] data) | ||
336 | { | ||
337 | |||
338 | } | ||
339 | |||
340 | public void CreateFromPrimData(PrimData primData) | ||
341 | { | ||
342 | this.CreateFromPrimData(primData, primData.Position, primData.LocalID, false); | ||
343 | } | ||
344 | |||
345 | public void CreateFromPrimData(PrimData primData, LLVector3 posi, uint localID, bool newprim) | ||
346 | { | ||
347 | |||
348 | } | ||
349 | |||
350 | #endregion | ||
351 | |||
352 | #region Packet Update Methods | ||
353 | protected void SetDefaultPacketValues(ObjectUpdatePacket.ObjectDataBlock objdata) | ||
354 | { | ||
355 | objdata.PSBlock = new byte[0]; | ||
356 | objdata.ExtraParams = new byte[1]; | ||
357 | objdata.MediaURL = new byte[0]; | ||
358 | objdata.NameValue = new byte[0]; | ||
359 | objdata.Text = new byte[0]; | ||
360 | objdata.TextColor = new byte[4]; | ||
361 | objdata.JointAxisOrAnchor = new LLVector3(0, 0, 0); | ||
362 | objdata.JointPivot = new LLVector3(0, 0, 0); | ||
363 | objdata.Material = 3; | ||
364 | objdata.TextureAnim = new byte[0]; | ||
365 | objdata.Sound = LLUUID.Zero; | ||
366 | LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); | ||
367 | this.primData.Texture = objdata.TextureEntry = ntex.ToBytes(); | ||
368 | objdata.State = 0; | ||
369 | objdata.Data = new byte[0]; | ||
370 | |||
371 | objdata.ObjectData = new byte[60]; | ||
372 | objdata.ObjectData[46] = 128; | ||
373 | objdata.ObjectData[47] = 63; | ||
374 | } | ||
375 | |||
376 | protected void SetPacketShapeData(ObjectUpdatePacket.ObjectDataBlock objectData) | ||
377 | { | ||
378 | objectData.OwnerID = this.primData.OwnerID; | ||
379 | objectData.PCode = this.primData.PCode; | ||
380 | objectData.PathBegin = this.primData.PathBegin; | ||
381 | objectData.PathEnd = this.primData.PathEnd; | ||
382 | objectData.PathScaleX = this.primData.PathScaleX; | ||
383 | objectData.PathScaleY = this.primData.PathScaleY; | ||
384 | objectData.PathShearX = this.primData.PathShearX; | ||
385 | objectData.PathShearY = this.primData.PathShearY; | ||
386 | objectData.PathSkew = this.primData.PathSkew; | ||
387 | objectData.ProfileBegin = this.primData.ProfileBegin; | ||
388 | objectData.ProfileEnd = this.primData.ProfileEnd; | ||
389 | objectData.Scale = this.primData.Scale; | ||
390 | objectData.PathCurve = this.primData.PathCurve; | ||
391 | objectData.ProfileCurve = this.primData.ProfileCurve; | ||
392 | objectData.ParentID = this.primData.ParentID; | ||
393 | objectData.ProfileHollow = this.primData.ProfileHollow; | ||
394 | objectData.PathRadiusOffset = this.primData.PathRadiusOffset; | ||
395 | objectData.PathRevolutions = this.primData.PathRevolutions; | ||
396 | objectData.PathTaperX = this.primData.PathTaperX; | ||
397 | objectData.PathTaperY = this.primData.PathTaperY; | ||
398 | objectData.PathTwist = this.primData.PathTwist; | ||
399 | objectData.PathTwistBegin = this.primData.PathTwistBegin; | ||
400 | } | ||
401 | |||
402 | #endregion | ||
403 | protected ObjectUpdatePacket.ObjectDataBlock CreateUpdateBlock() | ||
404 | { | ||
405 | ObjectUpdatePacket.ObjectDataBlock objupdate = new ObjectUpdatePacket.ObjectDataBlock(); | ||
406 | this.SetDefaultPacketValues(objupdate); | ||
407 | objupdate.UpdateFlags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456; | ||
408 | this.SetPacketShapeData(objupdate); | ||
409 | byte[] pb = this.Pos.GetBytes(); | ||
410 | Array.Copy(pb, 0, objupdate.ObjectData, 0, pb.Length); | ||
411 | return objupdate; | ||
412 | } | ||
413 | |||
414 | protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedBlock() | ||
415 | { | ||
416 | uint ID = this.localid; | ||
417 | byte[] bytes = new byte[60]; | ||
418 | |||
419 | int i = 0; | ||
420 | ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock(); | ||
421 | dat.TextureEntry = new byte[0]; | ||
422 | bytes[i++] = (byte)(ID % 256); | ||
423 | bytes[i++] = (byte)((ID >> 8) % 256); | ||
424 | bytes[i++] = (byte)((ID >> 16) % 256); | ||
425 | bytes[i++] = (byte)((ID >> 24) % 256); | ||
426 | bytes[i++] = 0; | ||
427 | bytes[i++] = 0; | ||
428 | |||
429 | LLVector3 lPos; | ||
430 | Axiom.MathLib.Quaternion lRot; | ||
431 | if (this._physActor != null && this.physicsEnabled) | ||
432 | { | ||
433 | PhysicsVector pPos = this._physActor.Position; | ||
434 | lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z); | ||
435 | lRot = this._physActor.Orientation; | ||
436 | } | ||
437 | else | ||
438 | { | ||
439 | lPos = this.Pos; | ||
440 | lRot = this.rotation; | ||
441 | } | ||
442 | byte[] pb = lPos.GetBytes(); | ||
443 | Array.Copy(pb, 0, bytes, i, pb.Length); | ||
444 | i += 12; | ||
445 | ushort ac = 32767; | ||
446 | |||
447 | //vel | ||
448 | bytes[i++] = (byte)(ac % 256); | ||
449 | bytes[i++] = (byte)((ac >> 8) % 256); | ||
450 | bytes[i++] = (byte)(ac % 256); | ||
451 | bytes[i++] = (byte)((ac >> 8) % 256); | ||
452 | bytes[i++] = (byte)(ac % 256); | ||
453 | bytes[i++] = (byte)((ac >> 8) % 256); | ||
454 | |||
455 | //accel | ||
456 | bytes[i++] = (byte)(ac % 256); | ||
457 | bytes[i++] = (byte)((ac >> 8) % 256); | ||
458 | bytes[i++] = (byte)(ac % 256); | ||
459 | bytes[i++] = (byte)((ac >> 8) % 256); | ||
460 | bytes[i++] = (byte)(ac % 256); | ||
461 | bytes[i++] = (byte)((ac >> 8) % 256); | ||
462 | |||
463 | ushort rw, rx, ry, rz; | ||
464 | rw = (ushort)(32768 * (lRot.w + 1)); | ||
465 | rx = (ushort)(32768 * (lRot.x + 1)); | ||
466 | ry = (ushort)(32768 * (lRot.y + 1)); | ||
467 | rz = (ushort)(32768 * (lRot.z + 1)); | ||
468 | |||
469 | //rot | ||
470 | bytes[i++] = (byte)(rx % 256); | ||
471 | bytes[i++] = (byte)((rx >> 8) % 256); | ||
472 | bytes[i++] = (byte)(ry % 256); | ||
473 | bytes[i++] = (byte)((ry >> 8) % 256); | ||
474 | bytes[i++] = (byte)(rz % 256); | ||
475 | bytes[i++] = (byte)((rz >> 8) % 256); | ||
476 | bytes[i++] = (byte)(rw % 256); | ||
477 | bytes[i++] = (byte)((rw >> 8) % 256); | ||
478 | |||
479 | //rotation vel | ||
480 | bytes[i++] = (byte)(ac % 256); | ||
481 | bytes[i++] = (byte)((ac >> 8) % 256); | ||
482 | bytes[i++] = (byte)(ac % 256); | ||
483 | bytes[i++] = (byte)((ac >> 8) % 256); | ||
484 | bytes[i++] = (byte)(ac % 256); | ||
485 | bytes[i++] = (byte)((ac >> 8) % 256); | ||
486 | |||
487 | dat.Data = bytes; | ||
488 | return dat; | ||
489 | } | ||
490 | } | ||
491 | } | ||
diff --git a/OpenSim/OpenSim/OpenSim.csproj b/OpenSim/OpenSim/OpenSim.csproj index 03ae6ab..0033d6b 100644 --- a/OpenSim/OpenSim/OpenSim.csproj +++ b/OpenSim/OpenSim/OpenSim.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>{438A9556-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{438A9556-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</AssemblyName> | 12 | <AssemblyName>OpenSim</AssemblyName> |
@@ -16,11 +15,9 @@ | |||
16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
17 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
18 | <OutputType>Exe</OutputType> | 17 | <OutputType>Exe</OutputType> |
19 | <AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
20 | </AppDesignerFolder> | ||
21 | <RootNamespace>OpenSim</RootNamespace> | 19 | <RootNamespace>OpenSim</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,87 +55,90 @@ | |||
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> |
88 | </ItemGroup> | 81 | </ItemGroup> |
89 | <ItemGroup> | 82 | <ItemGroup> |
90 | <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj"> | ||
91 | <Project>{C9702041-922C-452A-A1B4-7880AF53149A}</Project> | ||
92 | <Name>OpenGrid.Framework.Communications</Name> | ||
93 | </ProjectReference> | ||
94 | <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj"> | 83 | <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj"> |
95 | <Name>OpenSim.Terrain.BasicTerrain</Name> | 84 | <Name>OpenSim.Terrain.BasicTerrain</Name> |
96 | <Project>{2270B8FE-0000-0000-0000-000000000000}</Project> | 85 | <Project>{2270B8FE-0000-0000-0000-000000000000}</Project> |
97 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
98 | <Private>False</Private> | 87 | <Private>False</Private> |
99 | </ProjectReference> | 88 | </ProjectReference> |
100 | <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> | 89 | <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> |
101 | <Name>OpenSim.Framework</Name> | 90 | <Name>OpenSim.Framework</Name> |
102 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 91 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
103 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
104 | <Private>False</Private> | 93 | <Private>False</Private> |
105 | </ProjectReference> | 94 | </ProjectReference> |
106 | <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 95 | <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> |
107 | <Name>OpenSim.Framework.Console</Name> | 96 | <Name>OpenSim.Framework.Console</Name> |
108 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 97 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> |
109 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
110 | <Private>False</Private> | 99 | <Private>False</Private> |
111 | </ProjectReference> | 100 | </ProjectReference> |
112 | <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> | 101 | <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> |
113 | <Name>OpenSim.Physics.Manager</Name> | 102 | <Name>OpenSim.Physics.Manager</Name> |
114 | <Project>{8BE16150-0000-0000-0000-000000000000}</Project> | 103 | <Project>{8BE16150-0000-0000-0000-000000000000}</Project> |
115 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
116 | <Private>False</Private> | 105 | <Private>False</Private> |
117 | </ProjectReference> | 106 | </ProjectReference> |
118 | <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> | 107 | <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> |
119 | <Name>OpenSim.Servers</Name> | 108 | <Name>OpenSim.Servers</Name> |
120 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> | 109 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> |
121 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 110 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
122 | <Private>False</Private> | 111 | <Private>False</Private> |
112 | </ProjectReference> | ||
113 | <ProjectReference Include="..\OpenSim.World\OpenSim.World.csproj"> | ||
114 | <Name>OpenSim.World</Name> | ||
115 | <Project>{642A14A8-0000-0000-0000-000000000000}</Project> | ||
116 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
117 | <Private>False</Private> | ||
123 | </ProjectReference> | 118 | </ProjectReference> |
124 | <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj"> | 119 | <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj"> |
125 | <Name>OpenSim.RegionServer</Name> | 120 | <Name>OpenSim.RegionServer</Name> |
126 | <Project>{632E1BFD-0000-0000-0000-000000000000}</Project> | 121 | <Project>{632E1BFD-0000-0000-0000-000000000000}</Project> |
127 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 122 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
128 | <Private>False</Private> | 123 | <Private>False</Private> |
129 | </ProjectReference> | 124 | </ProjectReference> |
130 | <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj"> | 125 | <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj"> |
131 | <Name>OpenSim.GenericConfig.Xml</Name> | 126 | <Name>OpenSim.GenericConfig.Xml</Name> |
132 | <Project>{E88EF749-0000-0000-0000-000000000000}</Project> | 127 | <Project>{E88EF749-0000-0000-0000-000000000000}</Project> |
133 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 128 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
134 | <Private>False</Private> | 129 | <Private>False</Private> |
130 | </ProjectReference> | ||
131 | <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj"> | ||
132 | <Name>OpenGrid.Framework.Communications</Name> | ||
133 | <Project>{683344D5-0000-0000-0000-000000000000}</Project> | ||
134 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
135 | <Private>False</Private> | ||
135 | </ProjectReference> | 136 | </ProjectReference> |
136 | <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj"> | 137 | <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj"> |
137 | <Name>XMLRPC</Name> | 138 | <Name>XMLRPC</Name> |
138 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | 139 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> |
139 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 140 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
140 | <Private>False</Private> | 141 | <Private>False</Private> |
141 | </ProjectReference> | ||
142 | <ProjectReference Include="..\OpenSim.World\OpenSim.World.csproj"> | ||
143 | <Project>{642A14A8-0000-0000-0000-000000000000}</Project> | ||
144 | <Name>OpenSim.World</Name> | ||
145 | </ProjectReference> | 142 | </ProjectReference> |
146 | </ItemGroup> | 143 | </ItemGroup> |
147 | <ItemGroup> | 144 | <ItemGroup> |
@@ -159,4 +156,4 @@ | |||
159 | <PostBuildEvent> | 156 | <PostBuildEvent> |
160 | </PostBuildEvent> | 157 | </PostBuildEvent> |
161 | </PropertyGroup> | 158 | </PropertyGroup> |
162 | </Project> \ No newline at end of file | 159 | </Project> |
diff --git a/bin/XMLRPC.dll b/bin/XMLRPC.dll index 3d338bc..eb3e324 100644 --- a/bin/XMLRPC.dll +++ b/bin/XMLRPC.dll | |||
Binary files differ | |||
diff --git a/prebuild.xml b/prebuild.xml index 9280881..d96e405 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -74,6 +74,7 @@ | |||
74 | <Reference name="libsecondlife.dll"/> | 74 | <Reference name="libsecondlife.dll"/> |
75 | <Reference name="Db4objects.Db4o.dll"/> | 75 | <Reference name="Db4objects.Db4o.dll"/> |
76 | <Reference name="XMLRPC"/> | 76 | <Reference name="XMLRPC"/> |
77 | <Reference name="OpenSim.Framework.Console"/> | ||
77 | <Files> | 78 | <Files> |
78 | <Match pattern="*.cs" recurse="true"/> | 79 | <Match pattern="*.cs" recurse="true"/> |
79 | </Files> | 80 | </Files> |
@@ -123,6 +124,31 @@ | |||
123 | </Files> | 124 | </Files> |
124 | </Project> | 125 | </Project> |
125 | 126 | ||
127 | <!-- OpenGridFrameWork.Communications" --> | ||
128 | <Project name="OpenGrid.Framework.Communications" path="Common/OpenGrid.Framework.Communications" type="Library"> | ||
129 | <Configuration name="Debug"> | ||
130 | <Options> | ||
131 | <OutputPath>../../bin/</OutputPath> | ||
132 | </Options> | ||
133 | </Configuration> | ||
134 | <Configuration name="Release"> | ||
135 | <Options> | ||
136 | <OutputPath>../../bin/</OutputPath> | ||
137 | </Options> | ||
138 | </Configuration> | ||
139 | |||
140 | <ReferencePath>../../bin/</ReferencePath> | ||
141 | <Reference name="System"/> | ||
142 | <Reference name="System.Xml"/> | ||
143 | <Reference name="OpenSim.Framework"/> | ||
144 | <Reference name="libsecondlife.dll"/> | ||
145 | |||
146 | <Files> | ||
147 | <Match pattern="*.cs" recurse="true"/> | ||
148 | </Files> | ||
149 | </Project> | ||
150 | |||
151 | |||
126 | <!-- Storage Plug-ins --> | 152 | <!-- Storage Plug-ins --> |
127 | <Project name="OpenSim.Storage.LocalStorageDb4o" path="OpenSim/OpenSim.Storage/LocalStorageDb4o" type="Library"> | 153 | <Project name="OpenSim.Storage.LocalStorageDb4o" path="OpenSim/OpenSim.Storage/LocalStorageDb4o" type="Library"> |
128 | <Configuration name="Debug"> | 154 | <Configuration name="Debug"> |
@@ -469,6 +495,7 @@ | |||
469 | <Reference name="OpenSim.Physics.Manager"/> | 495 | <Reference name="OpenSim.Physics.Manager"/> |
470 | <Reference name="OpenSim.Servers"/> | 496 | <Reference name="OpenSim.Servers"/> |
471 | <Reference name="XMLRPC"/> | 497 | <Reference name="XMLRPC"/> |
498 | <Reference name="OpenGrid.Framework.Communications"/> | ||
472 | 499 | ||
473 | <Files> | 500 | <Files> |
474 | <Match pattern="*.cs" recurse="true"/> | 501 | <Match pattern="*.cs" recurse="true"/> |
@@ -499,8 +526,10 @@ | |||
499 | <Reference name="OpenSim.Framework.Console"/> | 526 | <Reference name="OpenSim.Framework.Console"/> |
500 | <Reference name="OpenSim.Physics.Manager"/> | 527 | <Reference name="OpenSim.Physics.Manager"/> |
501 | <Reference name="OpenSim.Servers"/> | 528 | <Reference name="OpenSim.Servers"/> |
529 | <Reference name="OpenSim.World"/> | ||
502 | <Reference name="OpenSim.RegionServer"/> | 530 | <Reference name="OpenSim.RegionServer"/> |
503 | <Reference name="OpenSim.GenericConfig.Xml"/> | 531 | <Reference name="OpenSim.GenericConfig.Xml"/> |
532 | <Reference name="OpenGrid.Framework.Communications"/> | ||
504 | <Reference name="XMLRPC"/> | 533 | <Reference name="XMLRPC"/> |
505 | 534 | ||
506 | <Files> | 535 | <Files> |