aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common/OpenGrid.Framework.Communications.OGS1
diff options
context:
space:
mode:
Diffstat (limited to 'Common/OpenGrid.Framework.Communications.OGS1')
-rw-r--r--Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs3
-rw-r--r--Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj61
2 files changed, 33 insertions, 31 deletions
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs b/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
index 0784ffa..308e00f 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
+++ b/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
@@ -1,12 +1,13 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenSim.Framework.Types;
4using OpenGrid.Framework.Communications; 5using OpenGrid.Framework.Communications;
5namespace OpenGrid.Framework.Communications.OGS1 6namespace OpenGrid.Framework.Communications.OGS1
6{ 7{
7 public class GridCommsManager : CommunicationsManager 8 public class GridCommsManager : CommunicationsManager
8 { 9 {
9 public GridCommsManager() 10 public GridCommsManager(NetworkServersInfo serversInfo) :base(serversInfo)
10 { 11 {
11 GridServer = new OGS1GridServices(); 12 GridServer = new OGS1GridServices();
12 InterRegion = new OGSInterSimComms(); 13 InterRegion = new OGSInterSimComms();
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj b/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
index 4a80635..3f4f22d 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
+++ b/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
@@ -1,13 +1,12 @@
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>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{C1F40DD4-A68B-4233-9142-CE236775A3CE}</ProjectGuid> 6 <ProjectGuid>{17442AF1-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
10 </ApplicationIcon>
11 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
12 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
13 <AssemblyName>OpenGrid.Framework.Communications.OGS1</AssemblyName> 12 <AssemblyName>OpenGrid.Framework.Communications.OGS1</AssemblyName>
@@ -16,11 +15,9 @@
16 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
17 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
18 <OutputType>Library</OutputType> 17 <OutputType>Library</OutputType>
19 <AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
20 </AppDesignerFolder>
21 <RootNamespace>OpenGrid.Framework.Communications.OGS1</RootNamespace> 19 <RootNamespace>OpenGrid.Framework.Communications.OGS1</RootNamespace>
22 <StartupObject> 20 <StartupObject></StartupObject>
23 </StartupObject>
24 <FileUpgradeFlags> 21 <FileUpgradeFlags>
25 </FileUpgradeFlags> 22 </FileUpgradeFlags>
26 </PropertyGroup> 23 </PropertyGroup>
@@ -31,8 +28,7 @@
31 <ConfigurationOverrideFile> 28 <ConfigurationOverrideFile>
32 </ConfigurationOverrideFile> 29 </ConfigurationOverrideFile>
33 <DefineConstants>TRACE;DEBUG</DefineConstants> 30 <DefineConstants>TRACE;DEBUG</DefineConstants>
34 <DocumentationFile> 31 <DocumentationFile></DocumentationFile>
35 </DocumentationFile>
36 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
37 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
38 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
41 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
43 <WarningLevel>4</WarningLevel> 39 <WarningLevel>4</WarningLevel>
44 <NoWarn> 40 <NoWarn></NoWarn>
45 </NoWarn>
46 </PropertyGroup> 41 </PropertyGroup>
47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
51 <ConfigurationOverrideFile> 46 <ConfigurationOverrideFile>
52 </ConfigurationOverrideFile> 47 </ConfigurationOverrideFile>
53 <DefineConstants>TRACE</DefineConstants> 48 <DefineConstants>TRACE</DefineConstants>
54 <DocumentationFile> 49 <DocumentationFile></DocumentationFile>
55 </DocumentationFile>
56 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
57 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
58 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
@@ -61,23 +55,22 @@
61 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
63 <WarningLevel>4</WarningLevel> 57 <WarningLevel>4</WarningLevel>
64 <NoWarn> 58 <NoWarn></NoWarn>
65 </NoWarn>
66 </PropertyGroup> 59 </PropertyGroup>
67 <ItemGroup> 60 <ItemGroup>
68 <Reference Include="libsecondlife.dll"> 61 <Reference Include="libsecondlife.dll" >
69 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 62 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
70 <Private>False</Private> 63 <Private>False</Private>
71 </Reference> 64 </Reference>
72 <Reference Include="System"> 65 <Reference Include="System" >
73 <HintPath>System.dll</HintPath> 66 <HintPath>System.dll</HintPath>
74 <Private>False</Private> 67 <Private>False</Private>
75 </Reference> 68 </Reference>
76 <Reference Include="System.Data"> 69 <Reference Include="System.Data" >
77 <HintPath>System.Data.dll</HintPath> 70 <HintPath>System.Data.dll</HintPath>
78 <Private>False</Private> 71 <Private>False</Private>
79 </Reference> 72 </Reference>
80 <Reference Include="System.Xml"> 73 <Reference Include="System.Xml" >
81 <HintPath>System.Xml.dll</HintPath> 74 <HintPath>System.Xml.dll</HintPath>
82 <Private>False</Private> 75 <Private>False</Private>
83 </Reference> 76 </Reference>
@@ -87,44 +80,52 @@
87 <Name>OpenGrid.Framework.Communications</Name> 80 <Name>OpenGrid.Framework.Communications</Name>
88 <Project>{683344D5-0000-0000-0000-000000000000}</Project> 81 <Project>{683344D5-0000-0000-0000-000000000000}</Project>
89 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
90 <Private>False</Private> 83 <Private>False</Private>
91 </ProjectReference> 84 </ProjectReference>
92 <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj"> 85 <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
93 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
94 <Name>OpenGrid.Framework.Data</Name> 86 <Name>OpenGrid.Framework.Data</Name>
87 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
88 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
89 <Private>False</Private>
95 </ProjectReference> 90 </ProjectReference>
96 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> 91 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
97 <Name>OpenSim.Framework</Name> 92 <Name>OpenSim.Framework</Name>
98 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 93 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
99 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 94 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
100 <Private>False</Private> 95 <Private>False</Private>
101 </ProjectReference> 96 </ProjectReference>
102 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 97 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
103 <Name>OpenSim.Framework.Console</Name> 98 <Name>OpenSim.Framework.Console</Name>
104 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 99 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
105 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 100 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
106 <Private>False</Private> 101 <Private>False</Private>
107 </ProjectReference> 102 </ProjectReference>
108 <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj"> 103 <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj">
109 <Name>OpenSim.Servers</Name> 104 <Name>OpenSim.Servers</Name>
110 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> 105 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
111 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 106 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
112 <Private>False</Private> 107 <Private>False</Private>
113 </ProjectReference> 108 </ProjectReference>
114 <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj"> 109 <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
115 <Name>XMLRPC</Name> 110 <Name>XMLRPC</Name>
116 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> 111 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
117 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 112 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
118 <Private>False</Private> 113 <Private>False</Private>
119 </ProjectReference> 114 </ProjectReference>
120 </ItemGroup> 115 </ItemGroup>
121 <ItemGroup> 116 <ItemGroup>
122 <Compile Include="GridCommsManager.cs" /> 117 <Compile Include="GridCommsManager.cs">
118 <SubType>Code</SubType>
119 </Compile>
123 <Compile Include="OGS1GridServices.cs"> 120 <Compile Include="OGS1GridServices.cs">
124 <SubType>Code</SubType> 121 <SubType>Code</SubType>
125 </Compile> 122 </Compile>
126 <Compile Include="OGSInterSimComms.cs" /> 123 <Compile Include="OGSInterSimComms.cs">
127 <Compile Include="OGSUserServices.cs" /> 124 <SubType>Code</SubType>
125 </Compile>
126 <Compile Include="OGSUserServices.cs">
127 <SubType>Code</SubType>
128 </Compile>
128 <Compile Include="Properties\AssemblyInfo.cs"> 129 <Compile Include="Properties\AssemblyInfo.cs">
129 <SubType>Code</SubType> 130 <SubType>Code</SubType>
130 </Compile> 131 </Compile>
@@ -136,4 +137,4 @@
136 <PostBuildEvent> 137 <PostBuildEvent>
137 </PostBuildEvent> 138 </PostBuildEvent>
138 </PropertyGroup> 139 </PropertyGroup>
139</Project> \ No newline at end of file 140</Project>
generated by cgit v1.1 at 2024-12-22 16:46:22 +0000