diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index 8678f7a..75e3cfd 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |||
@@ -58,14 +58,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
58 | public event ChildAgentUpdate OnChildAgentUpdate; | 58 | public event ChildAgentUpdate OnChildAgentUpdate; |
59 | public event RemoveKnownRegionsFromAvatarList OnRemoveKnownRegionFromAvatar; | 59 | public event RemoveKnownRegionsFromAvatarList OnRemoveKnownRegionFromAvatar; |
60 | 60 | ||
61 | private AgentCrossing handler001 = null; // OnAvatarCrossingIntoRegion; | 61 | private AgentCrossing handlerAvatarCrossingIntoRegion = null; // OnAvatarCrossingIntoRegion; |
62 | private ExpectUserDelegate handler002 = null; // OnExpectUser; | 62 | private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser; |
63 | private ExpectPrimDelegate handler003 = null; // OnExpectPrim; | 63 | private ExpectPrimDelegate handlerExpectPrim = null; // OnExpectPrim; |
64 | private CloseAgentConnection handler004 = null; // OnCloseAgentConnection; | 64 | private CloseAgentConnection handlerCloseAgentConnection = null; // OnCloseAgentConnection; |
65 | private PrimCrossing handler005 = null; // OnPrimCrossingIntoRegion; | 65 | private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion; |
66 | private RegionUp handler006 = null; // OnRegionUp; | 66 | private RegionUp handlerRegionUp = null; // OnRegionUp; |
67 | private ChildAgentUpdate handler007 = null; // OnChildAgentUpdate; | 67 | private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate; |
68 | private RemoveKnownRegionsFromAvatarList handler008 = null; // OnRemoveKnownRegionFromAvatar; | 68 | private RemoveKnownRegionsFromAvatarList handlerRemoveKnownRegionFromAvatar = null; // OnRemoveKnownRegionFromAvatar; |
69 | 69 | ||
70 | public KillObjectDelegate KillObject; | 70 | public KillObjectDelegate KillObject; |
71 | public string _debugRegionName = String.Empty; | 71 | public string _debugRegionName = String.Empty; |
@@ -132,30 +132,30 @@ namespace OpenSim.Region.Environment.Scenes | |||
132 | /// | 132 | /// |
133 | protected void NewUserConnection(ulong regionHandle, AgentCircuitData agent) | 133 | protected void NewUserConnection(ulong regionHandle, AgentCircuitData agent) |
134 | { | 134 | { |
135 | handler002 = OnExpectUser; | 135 | handlerExpectUser = OnExpectUser; |
136 | if (handler002 != null) | 136 | if (handlerExpectUser != null) |
137 | { | 137 | { |
138 | //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: OnExpectUser Fired for User:" + agent.firstname + " " + agent.lastname); | 138 | //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: OnExpectUser Fired for User:" + agent.firstname + " " + agent.lastname); |
139 | handler002(regionHandle, agent); | 139 | handlerExpectUser(regionHandle, agent); |
140 | } | 140 | } |
141 | } | 141 | } |
142 | 142 | ||
143 | protected bool newRegionUp(RegionInfo region) | 143 | protected bool newRegionUp(RegionInfo region) |
144 | { | 144 | { |
145 | handler006 = OnRegionUp; | 145 | handlerRegionUp = OnRegionUp; |
146 | if (handler006 != null) | 146 | if (handlerRegionUp != null) |
147 | { | 147 | { |
148 | //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: newRegionUp Fired for User:" + region.RegionName); | 148 | //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: newRegionUp Fired for User:" + region.RegionName); |
149 | handler006(region); | 149 | handlerRegionUp(region); |
150 | } | 150 | } |
151 | return true; | 151 | return true; |
152 | } | 152 | } |
153 | 153 | ||
154 | protected bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData) | 154 | protected bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData) |
155 | { | 155 | { |
156 | handler007 = OnChildAgentUpdate; | 156 | handlerChildAgentUpdate = OnChildAgentUpdate; |
157 | if (handler007 != null) | 157 | if (handlerChildAgentUpdate != null) |
158 | handler007(regionHandle, cAgentData); | 158 | handlerChildAgentUpdate(regionHandle, cAgentData); |
159 | 159 | ||
160 | 160 | ||
161 | return true; | 161 | return true; |
@@ -163,39 +163,39 @@ namespace OpenSim.Region.Environment.Scenes | |||
163 | 163 | ||
164 | protected void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) | 164 | protected void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) |
165 | { | 165 | { |
166 | handler001 = OnAvatarCrossingIntoRegion; | 166 | handlerAvatarCrossingIntoRegion = OnAvatarCrossingIntoRegion; |
167 | if (handler001 != null) | 167 | if (handlerAvatarCrossingIntoRegion != null) |
168 | { | 168 | { |
169 | handler001(regionHandle, agentID, position, isFlying); | 169 | handlerAvatarCrossingIntoRegion(regionHandle, agentID, position, isFlying); |
170 | } | 170 | } |
171 | } | 171 | } |
172 | 172 | ||
173 | protected void IncomingPrimCrossing(ulong regionHandle, LLUUID primID, String objXMLData) | 173 | protected void IncomingPrimCrossing(ulong regionHandle, LLUUID primID, String objXMLData) |
174 | { | 174 | { |
175 | handler003 = OnExpectPrim; | 175 | handlerExpectPrim = OnExpectPrim; |
176 | if (handler003 != null) | 176 | if (handlerExpectPrim != null) |
177 | { | 177 | { |
178 | handler003(regionHandle, primID, objXMLData); | 178 | handlerExpectPrim(regionHandle, primID, objXMLData); |
179 | } | 179 | } |
180 | 180 | ||
181 | } | 181 | } |
182 | 182 | ||
183 | protected void PrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical) | 183 | protected void PrimCrossing(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical) |
184 | { | 184 | { |
185 | handler005 = OnPrimCrossingIntoRegion; | 185 | handlerPrimCrossingIntoRegion = OnPrimCrossingIntoRegion; |
186 | if (handler005 != null) | 186 | if (handlerPrimCrossingIntoRegion != null) |
187 | { | 187 | { |
188 | handler005(regionHandle, primID, position, isPhysical); | 188 | handlerPrimCrossingIntoRegion(regionHandle, primID, position, isPhysical); |
189 | } | 189 | } |
190 | } | 190 | } |
191 | 191 | ||
192 | protected bool CloseConnection(ulong regionHandle, LLUUID agentID) | 192 | protected bool CloseConnection(ulong regionHandle, LLUUID agentID) |
193 | { | 193 | { |
194 | m_log.Info("[INTERREGION]: Incoming Agent Close Request for agent: " + agentID.ToString()); | 194 | m_log.Info("[INTERREGION]: Incoming Agent Close Request for agent: " + agentID.ToString()); |
195 | handler004 = OnCloseAgentConnection; | 195 | handlerCloseAgentConnection = OnCloseAgentConnection; |
196 | if (handler004 != null) | 196 | if (handlerCloseAgentConnection != null) |
197 | { | 197 | { |
198 | return handler004(regionHandle, agentID); | 198 | return handlerCloseAgentConnection(regionHandle, agentID); |
199 | } | 199 | } |
200 | return false; | 200 | return false; |
201 | } | 201 | } |
@@ -437,10 +437,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
437 | // We remove the list of known regions from the agent's known region list through an event | 437 | // We remove the list of known regions from the agent's known region list through an event |
438 | // to scene, because, if an agent logged of, it's likely that there will be no scene presence | 438 | // to scene, because, if an agent logged of, it's likely that there will be no scene presence |
439 | // by the time we get to this part of the method. | 439 | // by the time we get to this part of the method. |
440 | handler008 = OnRemoveKnownRegionFromAvatar; | 440 | handlerRemoveKnownRegionFromAvatar = OnRemoveKnownRegionFromAvatar; |
441 | if (handler008 != null) | 441 | if (handlerRemoveKnownRegionFromAvatar != null) |
442 | { | 442 | { |
443 | handler008(agentID, regionlst); | 443 | handlerRemoveKnownRegionFromAvatar(agentID, regionlst); |
444 | } | 444 | } |
445 | } | 445 | } |
446 | 446 | ||