aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs82
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneEvents.cs56
2 files changed, 69 insertions, 69 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 5037557..ac18919 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -141,16 +141,16 @@ namespace OpenSim.Region.ClientStack
141 private SetAlwaysRun handler017 = null; //OnSetAlwaysRun; 141 private SetAlwaysRun handler017 = null; //OnSetAlwaysRun;
142 private GenericCall2 handler018 = null; //OnCompleteMovementToRegion; 142 private GenericCall2 handler018 = null; //OnCompleteMovementToRegion;
143 private UpdateAgent handler019 = null; //OnAgentUpdate; 143 private UpdateAgent handler019 = null; //OnAgentUpdate;
144 private StartAnim handler020 = null; 144 private StartAnim handlerStartAnim = null;
145 private StopAnim handler021 = null; 145 private StopAnim handlerStopAnim = null;
146 private AgentRequestSit handler022 = null; //OnAgentRequestSit; 146 private AgentRequestSit handlerAgentRequestSit = null; //OnAgentRequestSit;
147 private AgentSit handler023 = null; //OnAgentSit; 147 private AgentSit handlerAgentSit = null; //OnAgentSit;
148 private AvatarPickerRequest handler024 = null; //OnAvatarPickerRequest; 148 private AvatarPickerRequest handlerAvatarPickerRequest = null; //OnAvatarPickerRequest;
149 private FetchInventory handler025 = null; //OnAgentDataUpdateRequest; 149 private FetchInventory handlerAgentDataUpdateRequest = null; //OnAgentDataUpdateRequest;
150 private FetchInventory handler026 = null; //OnUserInfoRequest; 150 private FetchInventory handlerUserInfoRequest = null; //OnUserInfoRequest;
151 private TeleportLocationRequest handler027 = null; //OnSetStartLocationRequest; 151 private TeleportLocationRequest handlerSetStartLocationRequest = null; //OnSetStartLocationRequest;
152 private LinkObjects handler028 = null; //OnLinkObjects; 152 private LinkObjects handlerLinkObjects = null; //OnLinkObjects;
153 private DelinkObjects handler029 = null; //OnDelinkObjects; 153 private DelinkObjects handlerDelinkObjects = null; //OnDelinkObjects;
154 private AddNewPrim handlerAddPrim = null; //OnAddPrim; 154 private AddNewPrim handlerAddPrim = null; //OnAddPrim;
155 private UpdateShape handlerUpdatePrimShape = null; //null; 155 private UpdateShape handlerUpdatePrimShape = null; //null;
156 private ObjectExtraParams handlerUpdateExtraParams = null; //OnUpdateExtraParams; 156 private ObjectExtraParams handlerUpdateExtraParams = null; //OnUpdateExtraParams;
@@ -3161,25 +3161,25 @@ namespace OpenSim.Region.ClientStack
3161 case PacketType.AgentAnimation: 3161 case PacketType.AgentAnimation:
3162 AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack; 3162 AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack;
3163 3163
3164 handler020 = null; 3164 handlerStartAnim = null;
3165 handler021 = null; 3165 handlerStopAnim = null;
3166 3166
3167 for (int i = 0; i < AgentAni.AnimationList.Length; i++) 3167 for (int i = 0; i < AgentAni.AnimationList.Length; i++)
3168 { 3168 {
3169 if (AgentAni.AnimationList[i].StartAnim) 3169 if (AgentAni.AnimationList[i].StartAnim)
3170 { 3170 {
3171 handler020 = OnStartAnim; 3171 handlerStartAnim = OnStartAnim;
3172 if (handler020 != null) 3172 if (handlerStartAnim != null)
3173 { 3173 {
3174 handler020(this, AgentAni.AnimationList[i].AnimID, 1); 3174 handlerStartAnim(this, AgentAni.AnimationList[i].AnimID, 1);
3175 } 3175 }
3176 } 3176 }
3177 else 3177 else
3178 { 3178 {
3179 handler021 = OnStopAnim; 3179 handlerStopAnim = OnStopAnim;
3180 if (handler021 != null) 3180 if (handlerStopAnim != null)
3181 { 3181 {
3182 handler021(this, AgentAni.AnimationList[i].AnimID); 3182 handlerStopAnim(this, AgentAni.AnimationList[i].AnimID);
3183 } 3183 }
3184 } 3184 }
3185 } 3185 }
@@ -3189,9 +3189,9 @@ namespace OpenSim.Region.ClientStack
3189 { 3189 {
3190 AgentRequestSitPacket agentRequestSit = (AgentRequestSitPacket)Pack; 3190 AgentRequestSitPacket agentRequestSit = (AgentRequestSitPacket)Pack;
3191 3191
3192 handler022 = OnAgentRequestSit; 3192 handlerAgentRequestSit = OnAgentRequestSit;
3193 if (handler022 != null) 3193 if (handlerAgentRequestSit != null)
3194 handler022(this, agentRequestSit.AgentData.AgentID, 3194 handlerAgentRequestSit(this, agentRequestSit.AgentData.AgentID,
3195 agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset); 3195 agentRequestSit.TargetObject.TargetID, agentRequestSit.TargetObject.Offset);
3196 } 3196 }
3197 break; 3197 break;
@@ -3200,8 +3200,8 @@ namespace OpenSim.Region.ClientStack
3200 { 3200 {
3201 AgentSitPacket agentSit = (AgentSitPacket)Pack; 3201 AgentSitPacket agentSit = (AgentSitPacket)Pack;
3202 3202
3203 handler023 = OnAgentSit; 3203 handlerAgentSit = OnAgentSit;
3204 if (handler023 != null) 3204 if (handlerAgentSit != null)
3205 { 3205 {
3206 OnAgentSit(this, agentSit.AgentData.AgentID); 3206 OnAgentSit(this, agentSit.AgentData.AgentID);
3207 } 3207 }
@@ -3213,31 +3213,31 @@ namespace OpenSim.Region.ClientStack
3213 AvatarPickerRequestPacket.DataBlock querydata = avRequestQuery.Data; 3213 AvatarPickerRequestPacket.DataBlock querydata = avRequestQuery.Data;
3214 //System.Console.WriteLine("Agent Sends:" + Helpers.FieldToUTF8String(querydata.Name)); 3214 //System.Console.WriteLine("Agent Sends:" + Helpers.FieldToUTF8String(querydata.Name));
3215 3215
3216 handler024 = OnAvatarPickerRequest; 3216 handlerAvatarPickerRequest = OnAvatarPickerRequest;
3217 if (handler024 != null) 3217 if (handlerAvatarPickerRequest != null)
3218 { 3218 {
3219 handler024(this, Requestdata.AgentID, Requestdata.QueryID, 3219 handlerAvatarPickerRequest(this, Requestdata.AgentID, Requestdata.QueryID,
3220 Helpers.FieldToUTF8String(querydata.Name)); 3220 Helpers.FieldToUTF8String(querydata.Name));
3221 } 3221 }
3222 break; 3222 break;
3223 case PacketType.AgentDataUpdateRequest: 3223 case PacketType.AgentDataUpdateRequest:
3224 AgentDataUpdateRequestPacket avRequestDataUpdatePacket = (AgentDataUpdateRequestPacket)Pack; 3224 AgentDataUpdateRequestPacket avRequestDataUpdatePacket = (AgentDataUpdateRequestPacket)Pack;
3225 3225
3226 handler025 = OnAgentDataUpdateRequest; 3226 handlerAgentDataUpdateRequest = OnAgentDataUpdateRequest;
3227 3227
3228 if (handler025 != null) 3228 if (handlerAgentDataUpdateRequest != null)
3229 { 3229 {
3230 handler025(this, avRequestDataUpdatePacket.AgentData.AgentID, avRequestDataUpdatePacket.AgentData.SessionID); 3230 handlerAgentDataUpdateRequest(this, avRequestDataUpdatePacket.AgentData.AgentID, avRequestDataUpdatePacket.AgentData.SessionID);
3231 } 3231 }
3232 3232
3233 break; 3233 break;
3234 case PacketType.UserInfoRequest: 3234 case PacketType.UserInfoRequest:
3235 UserInfoRequestPacket avUserInfoRequestPacket = (UserInfoRequestPacket)Pack; 3235 UserInfoRequestPacket avUserInfoRequestPacket = (UserInfoRequestPacket)Pack;
3236 3236
3237 handler026 = OnUserInfoRequest; 3237 handlerUserInfoRequest = OnUserInfoRequest;
3238 if (handler026 != null) 3238 if (handlerUserInfoRequest != null)
3239 { 3239 {
3240 handler026(this, avUserInfoRequestPacket.AgentData.AgentID, avUserInfoRequestPacket.AgentData.SessionID); 3240 handlerUserInfoRequest(this, avUserInfoRequestPacket.AgentData.AgentID, avUserInfoRequestPacket.AgentData.SessionID);
3241 3241
3242 } 3242 }
3243 break; 3243 break;
@@ -3247,10 +3247,10 @@ namespace OpenSim.Region.ClientStack
3247 3247
3248 if (avSetStartLocationRequestPacket.AgentData.AgentID == AgentId && avSetStartLocationRequestPacket.AgentData.SessionID == SessionId) 3248 if (avSetStartLocationRequestPacket.AgentData.AgentID == AgentId && avSetStartLocationRequestPacket.AgentData.SessionID == SessionId)
3249 { 3249 {
3250 handler027 = OnSetStartLocationRequest; 3250 handlerSetStartLocationRequest = OnSetStartLocationRequest;
3251 if (handler027 != null) 3251 if (handlerSetStartLocationRequest != null)
3252 { 3252 {
3253 handler027(this, 0, avSetStartLocationRequestPacket.StartLocationData.LocationPos, 3253 handlerSetStartLocationRequest(this, 0, avSetStartLocationRequestPacket.StartLocationData.LocationPos,
3254 avSetStartLocationRequestPacket.StartLocationData.LocationLookAt, 3254 avSetStartLocationRequestPacket.StartLocationData.LocationLookAt,
3255 avSetStartLocationRequestPacket.StartLocationData.LocationID); 3255 avSetStartLocationRequestPacket.StartLocationData.LocationID);
3256 } 3256 }
@@ -3279,10 +3279,10 @@ namespace OpenSim.Region.ClientStack
3279 childrenprims.Add(link.ObjectData[i].ObjectLocalID); 3279 childrenprims.Add(link.ObjectData[i].ObjectLocalID);
3280 } 3280 }
3281 } 3281 }
3282 handler028 = OnLinkObjects; 3282 handlerLinkObjects = OnLinkObjects;
3283 if (handler028 != null) 3283 if (handlerLinkObjects != null)
3284 { 3284 {
3285 handler028(parentprimid, childrenprims); 3285 handlerLinkObjects(parentprimid, childrenprims);
3286 } 3286 }
3287 break; 3287 break;
3288 case PacketType.ObjectDelink: 3288 case PacketType.ObjectDelink:
@@ -3297,10 +3297,10 @@ namespace OpenSim.Region.ClientStack
3297 { 3297 {
3298 prims.Add(delink.ObjectData[i].ObjectLocalID); 3298 prims.Add(delink.ObjectData[i].ObjectLocalID);
3299 } 3299 }
3300 handler029 = OnDelinkObjects; 3300 handlerDelinkObjects = OnDelinkObjects;
3301 if (handler029 != null) 3301 if (handlerDelinkObjects != null)
3302 { 3302 {
3303 handler029(prims); 3303 handlerDelinkObjects(prims);
3304 } 3304 }
3305 3305
3306 break; 3306 break;
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index 62011ea..055af55 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -182,13 +182,13 @@ namespace OpenSim.Region.Environment.Scenes
182 private RemoveScript handler016 = null; //OnRemoveScript; 182 private RemoveScript handler016 = null; //OnRemoveScript;
183 private SceneGroupMoved handler017 = null; //OnSceneGroupMove; 183 private SceneGroupMoved handler017 = null; //OnSceneGroupMove;
184 private SceneGroupGrabed handler018 = null; //OnSceneGroupGrab; 184 private SceneGroupGrabed handler018 = null; //OnSceneGroupGrab;
185 private LandObjectAdded handler020 = null; //OnLandObjectAdded; 185 private LandObjectAdded handlerLandObjectAdded = null; //OnLandObjectAdded;
186 private LandObjectRemoved handler021 = null; //OnLandObjectRemoved; 186 private LandObjectRemoved handlerLandObjectRemoved = null; //OnLandObjectRemoved;
187 private AvatarEnteringNewParcel handler022 = null; //OnAvatarEnteringNewParcel; 187 private AvatarEnteringNewParcel handlerAvatarEnteringNewParcel = null; //OnAvatarEnteringNewParcel;
188 private NewGridInstantMessage handler023 = null; //OnGridInstantMessageToIMModule; 188 private NewGridInstantMessage handlerGridInstantMessageToIM = null; //OnGridInstantMessageToIMModule;
189 private NewGridInstantMessage handler024 = null; //OnGridInstantMessageToFriendsModule; 189 private NewGridInstantMessage handlerGridInstantMessageToFriends = null; //OnGridInstantMessageToFriendsModule;
190 private ClientClosed handler025 = null; //OnClientClosed; 190 private ClientClosed handlerClientClosed = null; //OnClientClosed;
191 private OnNewPresenceDelegate handler026 = null; //OnMakeChildAgent; 191 private OnNewPresenceDelegate handlerMakeChildAgent = null; //OnMakeChildAgent;
192 192
193 public void TriggerOnScriptChangedEvent(uint localID, uint change) 193 public void TriggerOnScriptChangedEvent(uint localID, uint change)
194 { 194 {
@@ -343,20 +343,20 @@ namespace OpenSim.Region.Environment.Scenes
343 343
344 public void TriggerLandObjectAdded(Land newParcel, LLUUID regionID) 344 public void TriggerLandObjectAdded(Land newParcel, LLUUID regionID)
345 { 345 {
346 handler020 = OnLandObjectAdded; 346 handlerLandObjectAdded = OnLandObjectAdded;
347 347
348 if (handler020 != null) 348 if (handlerLandObjectAdded != null)
349 { 349 {
350 handler020(newParcel, regionID); 350 handlerLandObjectAdded(newParcel, regionID);
351 } 351 }
352 } 352 }
353 353
354 public void TriggerLandObjectRemoved(LLUUID globalID) 354 public void TriggerLandObjectRemoved(LLUUID globalID)
355 { 355 {
356 handler021 = OnLandObjectRemoved; 356 handlerLandObjectRemoved = OnLandObjectRemoved;
357 if (handler021 != null) 357 if (handlerLandObjectRemoved != null)
358 { 358 {
359 handler021(globalID); 359 handlerLandObjectRemoved(globalID);
360 } 360 }
361 } 361 }
362 362
@@ -369,11 +369,11 @@ namespace OpenSim.Region.Environment.Scenes
369 369
370 public void TriggerAvatarEnteringNewParcel(ScenePresence avatar, int localLandID, LLUUID regionID) 370 public void TriggerAvatarEnteringNewParcel(ScenePresence avatar, int localLandID, LLUUID regionID)
371 { 371 {
372 handler022 = OnAvatarEnteringNewParcel; 372 handlerAvatarEnteringNewParcel = OnAvatarEnteringNewParcel;
373 373
374 if (handler022 != null) 374 if (handlerAvatarEnteringNewParcel != null)
375 { 375 {
376 handler022(avatar, localLandID, regionID); 376 handlerAvatarEnteringNewParcel(avatar, localLandID, regionID);
377 } 377 }
378 } 378 }
379 379
@@ -384,18 +384,18 @@ namespace OpenSim.Region.Environment.Scenes
384 { 384 {
385 if ((whichModule & InstantMessageReceiver.IMModule) != 0) 385 if ((whichModule & InstantMessageReceiver.IMModule) != 0)
386 { 386 {
387 handler023 = OnGridInstantMessageToIMModule; 387 handlerGridInstantMessageToIM = OnGridInstantMessageToIMModule;
388 if (handler023 != null) 388 if (handlerGridInstantMessageToIM != null)
389 { 389 {
390 handler023(message); 390 handlerGridInstantMessageToIM(message);
391 } 391 }
392 } 392 }
393 if ((whichModule & InstantMessageReceiver.FriendsModule) != 0) 393 if ((whichModule & InstantMessageReceiver.FriendsModule) != 0)
394 { 394 {
395 handler024 = OnGridInstantMessageToFriendsModule; 395 handlerGridInstantMessageToFriends = OnGridInstantMessageToFriendsModule;
396 if (handler024 != null) 396 if (handlerGridInstantMessageToFriends != null)
397 { 397 {
398 handler024(message); 398 handlerGridInstantMessageToFriends(message);
399 } 399 }
400 400
401 } 401 }
@@ -403,19 +403,19 @@ namespace OpenSim.Region.Environment.Scenes
403 403
404 public void TriggerClientClosed(LLUUID ClientID) 404 public void TriggerClientClosed(LLUUID ClientID)
405 { 405 {
406 handler025 = OnClientClosed; 406 handlerClientClosed = OnClientClosed;
407 if (handler025 != null) 407 if (handlerClientClosed != null)
408 { 408 {
409 handler025(ClientID); 409 handlerClientClosed(ClientID);
410 } 410 }
411 } 411 }
412 412
413 public void TriggerOnMakeChildAgent(ScenePresence presence) 413 public void TriggerOnMakeChildAgent(ScenePresence presence)
414 { 414 {
415 handler026 = OnMakeChildAgent; 415 handlerMakeChildAgent = OnMakeChildAgent;
416 if (handler026 != null) 416 if (handlerMakeChildAgent != null)
417 { 417 {
418 handler026(presence); 418 handlerMakeChildAgent(presence);
419 } 419 }
420 420
421 } 421 }