aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs56
1 files changed, 28 insertions, 28 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index d21852d..2fce37e 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -59,13 +59,13 @@ namespace OpenSim.Region.Communications.OGS1
59 public event ChildAgentUpdate OnChildAgentUpdate; 59 public event ChildAgentUpdate OnChildAgentUpdate;
60 public event TellRegionToCloseChildConnection OnTellRegionToCloseChildConnection; 60 public event TellRegionToCloseChildConnection OnTellRegionToCloseChildConnection;
61 61
62 private InformRegionChild handler001 = null; // OnChildAgent; 62 private InformRegionChild handlerChildAgent = null; // OnChildAgent;
63 private ExpectArrival handler002 = null; // OnArrival; 63 private ExpectArrival handlerArrival = null; // OnArrival;
64 private InformRegionPrimGroup handler003 = null; // OnPrimGroupNear; 64 private InformRegionPrimGroup handlerPrimGroupNear = null; // OnPrimGroupNear;
65 private PrimGroupArrival handler004 = null; // OnPrimGroupArrival; 65 private PrimGroupArrival handlerPrimGroupArrival = null; // OnPrimGroupArrival;
66 private RegionUp handler005 = null; // OnRegionUp; 66 private RegionUp handlerRegionUp = null; // OnRegionUp;
67 private ChildAgentUpdate handler006 = null; // OnChildAgentUpdate; 67 private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;
68 private TellRegionToCloseChildConnection handler007 = null; // OnTellRegionToCloseChildConnection; 68 private TellRegionToCloseChildConnection handlerTellRegionToCloseChildConnection = null; // OnTellRegionToCloseChildConnection;
69 69
70 70
71 static InterRegionSingleton() 71 static InterRegionSingleton()
@@ -83,70 +83,70 @@ namespace OpenSim.Region.Communications.OGS1
83 83
84 public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) 84 public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
85 { 85 {
86 handler001 = OnChildAgent; 86 handlerChildAgent = OnChildAgent;
87 if (handler001 != null) 87 if (handlerChildAgent != null)
88 { 88 {
89 return handler001(regionHandle, agentData); 89 return handlerChildAgent(regionHandle, agentData);
90 } 90 }
91 return false; 91 return false;
92 } 92 }
93 93
94 public bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle) 94 public bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle)
95 { 95 {
96 handler005 = OnRegionUp; 96 handlerRegionUp = OnRegionUp;
97 if (handler005 != null) 97 if (handlerRegionUp != null)
98 { 98 {
99 return handler005(sregion, regionhandle); 99 return handlerRegionUp(sregion, regionhandle);
100 } 100 }
101 return false; 101 return false;
102 } 102 }
103 103
104 public bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentUpdate) 104 public bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentUpdate)
105 { 105 {
106 handler006 = OnChildAgentUpdate; 106 handlerChildAgentUpdate = OnChildAgentUpdate;
107 if (handler006 != null) 107 if (handlerChildAgentUpdate != null)
108 { 108 {
109 return handler006(regionHandle, cAgentUpdate); 109 return handlerChildAgentUpdate(regionHandle, cAgentUpdate);
110 } 110 }
111 return false; 111 return false;
112 } 112 }
113 113
114 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) 114 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying)
115 { 115 {
116 handler002 = OnArrival; 116 handlerArrival = OnArrival;
117 if (handler002 != null) 117 if (handlerArrival != null)
118 { 118 {
119 return handler002(regionHandle, agentID, position, isFlying); 119 return handlerArrival(regionHandle, agentID, position, isFlying);
120 } 120 }
121 return false; 121 return false;
122 } 122 }
123 123
124 public bool InformRegionPrim(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical) 124 public bool InformRegionPrim(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical)
125 { 125 {
126 handler003 = OnPrimGroupNear; 126 handlerPrimGroupNear = OnPrimGroupNear;
127 if (handler003 != null) 127 if (handlerPrimGroupNear != null)
128 { 128 {
129 return handler003(regionHandle, primID, position, isPhysical); 129 return handlerPrimGroupNear(regionHandle, primID, position, isPhysical);
130 } 130 }
131 return false; 131 return false;
132 } 132 }
133 133
134 public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, string objData) 134 public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, string objData)
135 { 135 {
136 handler004 = OnPrimGroupArrival; 136 handlerPrimGroupArrival = OnPrimGroupArrival;
137 if (handler004 != null) 137 if (handlerPrimGroupArrival != null)
138 { 138 {
139 return handler004(regionHandle, primID, objData); 139 return handlerPrimGroupArrival(regionHandle, primID, objData);
140 } 140 }
141 return false; 141 return false;
142 } 142 }
143 143
144 public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) 144 public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID)
145 { 145 {
146 handler007 = OnTellRegionToCloseChildConnection; 146 handlerTellRegionToCloseChildConnection = OnTellRegionToCloseChildConnection;
147 if (handler007 != null) 147 if (handlerTellRegionToCloseChildConnection != null)
148 { 148 {
149 return handler007(regionHandle, agentID); 149 return handlerTellRegionToCloseChildConnection(regionHandle, agentID);
150 } 150 }
151 return false; 151 return false;
152 } 152 }