diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs index 0b7bd82..a127010 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs | |||
@@ -27,17 +27,19 @@ | |||
27 | */ | 27 | */ |
28 | 28 | ||
29 | using System; | 29 | using System; |
30 | using System.Runtime.Remoting; | ||
30 | using libsecondlife; | 31 | using libsecondlife; |
31 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
32 | 33 | ||
33 | namespace OpenSim.Region.Communications.OGS1 | 34 | namespace OpenSim.Region.Communications.OGS1 |
34 | { | 35 | { |
35 | public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData); | 36 | public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData); |
37 | |||
36 | public delegate bool ExpectArrival(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying); | 38 | public delegate bool ExpectArrival(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying); |
37 | 39 | ||
38 | public sealed class InterRegionSingleton | 40 | public sealed class InterRegionSingleton |
39 | { | 41 | { |
40 | static readonly InterRegionSingleton instance = new InterRegionSingleton(); | 42 | private static readonly InterRegionSingleton instance = new InterRegionSingleton(); |
41 | 43 | ||
42 | public event InformRegionChild OnChildAgent; | 44 | public event InformRegionChild OnChildAgent; |
43 | public event ExpectArrival OnArrival; | 45 | public event ExpectArrival OnArrival; |
@@ -46,16 +48,13 @@ namespace OpenSim.Region.Communications.OGS1 | |||
46 | { | 48 | { |
47 | } | 49 | } |
48 | 50 | ||
49 | InterRegionSingleton() | 51 | private InterRegionSingleton() |
50 | { | 52 | { |
51 | } | 53 | } |
52 | 54 | ||
53 | public static InterRegionSingleton Instance | 55 | public static InterRegionSingleton Instance |
54 | { | 56 | { |
55 | get | 57 | get { return instance; } |
56 | { | ||
57 | return instance; | ||
58 | } | ||
59 | } | 58 | } |
60 | 59 | ||
61 | public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) | 60 | public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) |
@@ -79,7 +78,6 @@ namespace OpenSim.Region.Communications.OGS1 | |||
79 | 78 | ||
80 | public class OGS1InterRegionRemoting : MarshalByRefObject | 79 | public class OGS1InterRegionRemoting : MarshalByRefObject |
81 | { | 80 | { |
82 | |||
83 | public OGS1InterRegionRemoting() | 81 | public OGS1InterRegionRemoting() |
84 | { | 82 | { |
85 | } | 83 | } |
@@ -90,7 +88,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
90 | { | 88 | { |
91 | return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData); | 89 | return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData); |
92 | } | 90 | } |
93 | catch (System.Runtime.Remoting.RemotingException e) | 91 | catch (RemotingException e) |
94 | { | 92 | { |
95 | Console.WriteLine("Remoting Error: Unable to connect to remote region.\n" + e.ToString()); | 93 | Console.WriteLine("Remoting Error: Unable to connect to remote region.\n" + e.ToString()); |
96 | return false; | 94 | return false; |
@@ -103,11 +101,11 @@ namespace OpenSim.Region.Communications.OGS1 | |||
103 | { | 101 | { |
104 | return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position, isFlying); | 102 | return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position, isFlying); |
105 | } | 103 | } |
106 | catch (System.Runtime.Remoting.RemotingException e) | 104 | catch (RemotingException e) |
107 | { | 105 | { |
108 | Console.WriteLine("Remoting Error: Unable to connect to remote region.\n" + e.ToString()); | 106 | Console.WriteLine("Remoting Error: Unable to connect to remote region.\n" + e.ToString()); |
109 | return false; | 107 | return false; |
110 | } | 108 | } |
111 | } | 109 | } |
112 | } | 110 | } |
113 | } | 111 | } \ No newline at end of file |