diff options
Diffstat (limited to '')
-rw-r--r-- | Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs | 18 | ||||
-rw-r--r-- | Common/OpenGrid.Framework.Communications.OGS1/OGSUserServices.cs | 25 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1GridServices.cs (renamed from Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs) | 6 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs (renamed from Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj (renamed from Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj) | 54 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs (renamed from Common/OpenGrid.Framework.Communications.OGS1/Properties/AssemblyInfo.cs) | 0 |
6 files changed, 31 insertions, 76 deletions
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs b/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs deleted file mode 100644 index 563eaf7..0000000 --- a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using OpenSim.Framework.Types; | ||
5 | using OpenGrid.Framework.Communications; | ||
6 | namespace OpenGrid.Framework.Communications.OGS1 | ||
7 | { | ||
8 | public class GridCommsManager : CommunicationsManager | ||
9 | { | ||
10 | private OGS1GridServices gridInterComms = new OGS1GridServices(); | ||
11 | public GridCommsManager(NetworkServersInfo serversInfo) :base(serversInfo) | ||
12 | { | ||
13 | GridServer = gridInterComms; | ||
14 | InterRegion = gridInterComms; | ||
15 | UserServer = new OGSUserServices(); | ||
16 | } | ||
17 | } | ||
18 | } | ||
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGSUserServices.cs b/Common/OpenGrid.Framework.Communications.OGS1/OGSUserServices.cs deleted file mode 100644 index 1667e6b..0000000 --- a/Common/OpenGrid.Framework.Communications.OGS1/OGSUserServices.cs +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using OpenGrid.Framework.Communications; | ||
5 | using OpenGrid.Framework.Data; | ||
6 | using libsecondlife; | ||
7 | |||
8 | namespace OpenGrid.Framework.Communications.OGS1 | ||
9 | { | ||
10 | public class OGSUserServices :IUserServices | ||
11 | { | ||
12 | public UserProfileData GetUserProfile(string firstName, string lastName) | ||
13 | { | ||
14 | return null; | ||
15 | } | ||
16 | public UserProfileData GetUserProfile(string name) | ||
17 | { | ||
18 | return null; | ||
19 | } | ||
20 | public UserProfileData GetUserProfile(LLUUID avatarID) | ||
21 | { | ||
22 | return null; | ||
23 | } | ||
24 | } | ||
25 | } | ||
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index db64f0c..5f0c80c 100644 --- a/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | |||
@@ -6,15 +6,15 @@ using System.Runtime.Remoting; | |||
6 | using System.Runtime.Remoting.Channels; | 6 | using System.Runtime.Remoting.Channels; |
7 | using System.Runtime.Remoting.Channels.Tcp; | 7 | using System.Runtime.Remoting.Channels.Tcp; |
8 | 8 | ||
9 | using OpenSim.Servers; | 9 | using OpenSim.Framework.Servers; |
10 | using OpenSim.Framework; | 10 | using OpenSim.Framework; |
11 | using OpenSim.Framework.Types; | 11 | using OpenSim.Framework.Types; |
12 | using OpenGrid.Framework.Communications; | 12 | using OpenSim.Framework.Communications; |
13 | 13 | ||
14 | using Nwc.XmlRpc; | 14 | using Nwc.XmlRpc; |
15 | using libsecondlife; | 15 | using libsecondlife; |
16 | 16 | ||
17 | namespace OpenGrid.Framework.Communications.OGS1 | 17 | namespace OpenSim.Region.Communications.OGS1 |
18 | { | 18 | { |
19 | public class OGS1GridServices : IGridServices, IInterRegionCommunications | 19 | public class OGS1GridServices : IGridServices, IInterRegionCommunications |
20 | { | 20 | { |
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs index 3d74e2f..51b33e9 100644 --- a/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs | |||
@@ -2,8 +2,8 @@ using System; | |||
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Text; | 3 | using System.Text; |
4 | using OpenSim.Framework.Types; | 4 | using OpenSim.Framework.Types; |
5 | using OpenGrid.Framework.Communications; | 5 | using OpenSim.Framework.Communications; |
6 | namespace OpenGrid.Framework.Communications.OGS1 | 6 | namespace OpenSim.Region.Communications.OGS1 |
7 | { | 7 | { |
8 | public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData); | 8 | public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData); |
9 | public delegate bool ExpectArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position); | 9 | public delegate bool ExpectArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position); |
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj index 804ddba..d6abd13 100644 --- a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj +++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj | |||
@@ -3,20 +3,20 @@ | |||
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>{17442AF1-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{4806E378-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></ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
11 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
12 | <AssemblyName>OpenGrid.Framework.Communications.OGS1</AssemblyName> | 12 | <AssemblyName>OpenSim.Region.Communications.OGS1</AssemblyName> |
13 | <DefaultClientScript>JScript</DefaultClientScript> | 13 | <DefaultClientScript>JScript</DefaultClientScript> |
14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> | 14 | <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> |
15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
16 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
17 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
18 | <AppDesignerFolder></AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
19 | <RootNamespace>OpenGrid.Framework.Communications.OGS1</RootNamespace> | 19 | <RootNamespace>OpenSim.Region.Communications.OGS1</RootNamespace> |
20 | <StartupObject></StartupObject> | 20 | <StartupObject></StartupObject> |
21 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
22 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
@@ -32,7 +32,7 @@ | |||
32 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
33 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
34 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
35 | <OutputPath>..\..\bin\</OutputPath> | 35 | <OutputPath>..\..\..\..\bin\</OutputPath> |
36 | <RegisterForComInterop>False</RegisterForComInterop> | 36 | <RegisterForComInterop>False</RegisterForComInterop> |
37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -50,7 +50,7 @@ | |||
50 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
51 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
52 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
53 | <OutputPath>..\..\bin\</OutputPath> | 53 | <OutputPath>..\..\..\..\bin\</OutputPath> |
54 | <RegisterForComInterop>False</RegisterForComInterop> | 54 | <RegisterForComInterop>False</RegisterForComInterop> |
55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
@@ -59,7 +59,7 @@ | |||
59 | </PropertyGroup> | 59 | </PropertyGroup> |
60 | <ItemGroup> | 60 | <ItemGroup> |
61 | <Reference Include="libsecondlife.dll" > | 61 | <Reference Include="libsecondlife.dll" > |
62 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | 62 | <HintPath>..\..\..\..\bin\libsecondlife.dll</HintPath> |
63 | <Private>False</Private> | 63 | <Private>False</Private> |
64 | </Reference> | 64 | </Reference> |
65 | <Reference Include="System" > | 65 | <Reference Include="System" > |
@@ -78,56 +78,54 @@ | |||
78 | <HintPath>System.Xml.dll</HintPath> | 78 | <HintPath>System.Xml.dll</HintPath> |
79 | <Private>False</Private> | 79 | <Private>False</Private> |
80 | </Reference> | 80 | </Reference> |
81 | <Reference Include="XMLRPC.dll" > | ||
82 | <HintPath>..\..\..\..\bin\XMLRPC.dll</HintPath> | ||
83 | <Private>False</Private> | ||
84 | </Reference> | ||
81 | </ItemGroup> | 85 | </ItemGroup> |
82 | <ItemGroup> | 86 | <ItemGroup> |
83 | <ProjectReference Include="..\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj"> | 87 | <ProjectReference Include="..\..\..\Framework\General\OpenSim.Framework.csproj"> |
84 | <Name>OpenGrid.Framework.Communications</Name> | 88 | <Name>OpenSim.Framework</Name> |
85 | <Project>{683344D5-0000-0000-0000-000000000000}</Project> | 89 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
87 | <Private>False</Private> | ||
88 | </ProjectReference> | ||
89 | <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj"> | ||
90 | <Name>OpenGrid.Framework.Data</Name> | ||
91 | <Project>{62CDF671-0000-0000-0000-000000000000}</Project> | ||
92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 90 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
93 | <Private>False</Private> | 91 | <Private>False</Private> |
94 | </ProjectReference> | 92 | </ProjectReference> |
95 | <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> | 93 | <ProjectReference Include="..\..\..\Framework\Communications\OpenSim.Framework.Communications.csproj"> |
96 | <Name>OpenSim.Framework</Name> | 94 | <Name>OpenSim.Framework.Communications</Name> |
97 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 95 | <Project>{CB52B7E7-0000-0000-0000-000000000000}</Project> |
98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 96 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
99 | <Private>False</Private> | 97 | <Private>False</Private> |
100 | </ProjectReference> | 98 | </ProjectReference> |
101 | <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 99 | <ProjectReference Include="..\..\..\Framework\Console\OpenSim.Framework.Console.csproj"> |
102 | <Name>OpenSim.Framework.Console</Name> | 100 | <Name>OpenSim.Framework.Console</Name> |
103 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 101 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> |
104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 102 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
105 | <Private>False</Private> | 103 | <Private>False</Private> |
106 | </ProjectReference> | 104 | </ProjectReference> |
107 | <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj"> | 105 | <ProjectReference Include="..\..\..\Framework\Data\OpenSim.Framework.Data.csproj"> |
108 | <Name>OpenSim.Servers</Name> | 106 | <Name>OpenSim.Framework.Data</Name> |
109 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> | 107 | <Project>{36B72A9B-0000-0000-0000-000000000000}</Project> |
110 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 108 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
111 | <Private>False</Private> | 109 | <Private>False</Private> |
112 | </ProjectReference> | 110 | </ProjectReference> |
113 | <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj"> | 111 | <ProjectReference Include="..\..\..\Framework\Servers\OpenSim.Framework.Servers.csproj"> |
114 | <Name>XMLRPC</Name> | 112 | <Name>OpenSim.Framework.Servers</Name> |
115 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | 113 | <Project>{2CC71860-0000-0000-0000-000000000000}</Project> |
116 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 114 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
117 | <Private>False</Private> | 115 | <Private>False</Private> |
118 | </ProjectReference> | 116 | </ProjectReference> |
119 | </ItemGroup> | 117 | </ItemGroup> |
120 | <ItemGroup> | 118 | <ItemGroup> |
121 | <Compile Include="GridCommsManager.cs"> | 119 | <Compile Include="CommunicationsOGS1.cs"> |
122 | <SubType>Code</SubType> | 120 | <SubType>Code</SubType> |
123 | </Compile> | 121 | </Compile> |
124 | <Compile Include="OGS1GridServices.cs"> | 122 | <Compile Include="OGS1GridServices.cs"> |
125 | <SubType>Code</SubType> | 123 | <SubType>Code</SubType> |
126 | </Compile> | 124 | </Compile> |
127 | <Compile Include="OGSInterSimComms.cs"> | 125 | <Compile Include="OGS1InterSimComms.cs"> |
128 | <SubType>Code</SubType> | 126 | <SubType>Code</SubType> |
129 | </Compile> | 127 | </Compile> |
130 | <Compile Include="OGSUserServices.cs"> | 128 | <Compile Include="OGS1UserServices.cs"> |
131 | <SubType>Code</SubType> | 129 | <SubType>Code</SubType> |
132 | </Compile> | 130 | </Compile> |
133 | <Compile Include="Properties\AssemblyInfo.cs"> | 131 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/Properties/AssemblyInfo.cs b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs index 0c6f965..0c6f965 100644 --- a/Common/OpenGrid.Framework.Communications.OGS1/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/Communications/OGS1/Properties/AssemblyInfo.cs | |||