diff options
author | MW | 2007-05-31 12:52:17 +0000 |
---|---|---|
committer | MW | 2007-05-31 12:52:17 +0000 |
commit | c194bfbada321c7ae99a67e8fe694cdb57cb843e (patch) | |
tree | 61f72fd7d474b7378a59b5f9b74839f385b35bec | |
parent | Die AuthenticateSessionsRemote. hrrm okay don't die, just partially die (diff) | |
download | opensim-SC-c194bfbada321c7ae99a67e8fe694cdb57cb843e.zip opensim-SC-c194bfbada321c7ae99a67e8fe694cdb57cb843e.tar.gz opensim-SC-c194bfbada321c7ae99a67e8fe694cdb57cb843e.tar.bz2 opensim-SC-c194bfbada321c7ae99a67e8fe694cdb57cb843e.tar.xz |
3 files changed, 20 insertions, 2 deletions
diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj index bda9184..80297f3 100644 --- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj +++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj | |||
@@ -28,6 +28,10 @@ | |||
28 | <WarningLevel>4</WarningLevel> | 28 | <WarningLevel>4</WarningLevel> |
29 | </PropertyGroup> | 29 | </PropertyGroup> |
30 | <ItemGroup> | 30 | <ItemGroup> |
31 | <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
32 | <SpecificVersion>False</SpecificVersion> | ||
33 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | ||
34 | </Reference> | ||
31 | <Reference Include="System" /> | 35 | <Reference Include="System" /> |
32 | <Reference Include="System.Data" /> | 36 | <Reference Include="System.Data" /> |
33 | <Reference Include="System.Xml" /> | 37 | <Reference Include="System.Xml" /> |
diff --git a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs index c5413d2..4f42f8b 100644 --- a/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs +++ b/Common/OpenGrid.Framework.Communications/RegionServerCommsManager.cs | |||
@@ -4,6 +4,7 @@ using System.Text; | |||
4 | using OpenSim.Framework; | 4 | using OpenSim.Framework; |
5 | using OpenSim.Framework.Interfaces; | 5 | using OpenSim.Framework.Interfaces; |
6 | using OpenSim.Framework.Types; | 6 | using OpenSim.Framework.Types; |
7 | using libsecondlife; | ||
7 | 8 | ||
8 | namespace OpenGrid.Framework.Communications | 9 | namespace OpenGrid.Framework.Communications |
9 | { | 10 | { |
@@ -19,7 +20,7 @@ namespace OpenGrid.Framework.Communications | |||
19 | /// | 20 | /// |
20 | /// </summary> | 21 | /// </summary> |
21 | /// <returns></returns> | 22 | /// <returns></returns> |
22 | public virtual RegionInfo LoadRegionConfigFromGridServer() | 23 | public virtual RegionInfo LoadRegionConfigFromGridServer(LLUUID regionID) |
23 | { | 24 | { |
24 | return null; | 25 | return null; |
25 | } | 26 | } |
@@ -37,8 +38,18 @@ namespace OpenGrid.Framework.Communications | |||
37 | /// <summary> | 38 | /// <summary> |
38 | /// | 39 | /// |
39 | /// </summary> | 40 | /// </summary> |
41 | /// <param name="regionInfo"></param> | ||
42 | /// <returns></returns> | ||
43 | public virtual List<RegionInfo> RequestNeighbours(RegionInfo regionInfo) | ||
44 | { | ||
45 | return null; | ||
46 | } | ||
47 | |||
48 | /// <summary> | ||
49 | /// | ||
50 | /// </summary> | ||
40 | /// <returns></returns> | 51 | /// <returns></returns> |
41 | public virtual bool InformNeighbourOfChildAgent() | 52 | public virtual bool InformNeighbourOfChildAgent( uint regionHandle, AgentCircuitData agentData) //should change from agentCircuitData |
42 | { | 53 | { |
43 | return false; | 54 | return false; |
44 | } | 55 | } |
diff --git a/Common/OpenSim.Framework/IRegionCommsHost.cs b/Common/OpenSim.Framework/IRegionCommsHost.cs index 006661d..815bd8e 100644 --- a/Common/OpenSim.Framework/IRegionCommsHost.cs +++ b/Common/OpenSim.Framework/IRegionCommsHost.cs | |||
@@ -2,15 +2,18 @@ using System; | |||
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Text; | 3 | using System.Text; |
4 | using OpenSim.Framework.Interfaces; | 4 | using OpenSim.Framework.Interfaces; |
5 | using OpenSim.Framework.Types; | ||
5 | 6 | ||
6 | namespace OpenSim.Framework | 7 | namespace OpenSim.Framework |
7 | { | 8 | { |
8 | public delegate void ExpectUserDelegate(); | 9 | public delegate void ExpectUserDelegate(); |
10 | public delegate void UpdateNeighbours(List<RegionInfo> neighbours); | ||
9 | 11 | ||
10 | public interface IRegionCommsHost | 12 | public interface IRegionCommsHost |
11 | { | 13 | { |
12 | event ExpectUserDelegate OnExpectUser; | 14 | event ExpectUserDelegate OnExpectUser; |
13 | event GenericCall2 OnExpectChildAgent; | 15 | event GenericCall2 OnExpectChildAgent; |
14 | event GenericCall2 OnAvatarCrossingIntoRegion; | 16 | event GenericCall2 OnAvatarCrossingIntoRegion; |
17 | event UpdateNeighbours OnNeighboursUpdate; | ||
15 | } | 18 | } |
16 | } | 19 | } |